diff options
| author | James <> | 2013-03-17 12:16:37 +0000 |
|---|---|---|
| committer | James <> | 2013-03-17 12:16:37 +0000 |
| commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
| tree | 61213d67e7fa87b20356b23798558e2c4212c42f /tools/ipkg-utils/patches/.svn/text-base/170-resolve_conffiles.patch.svn-base | |
| download | trunk-36060-27b76ab0671089c47506615a796a261e993896a7.tar.gz trunk-36060-27b76ab0671089c47506615a796a261e993896a7.tar.bz2 trunk-36060-27b76ab0671089c47506615a796a261e993896a7.zip | |
Diffstat (limited to 'tools/ipkg-utils/patches/.svn/text-base/170-resolve_conffiles.patch.svn-base')
| -rw-r--r-- | tools/ipkg-utils/patches/.svn/text-base/170-resolve_conffiles.patch.svn-base | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tools/ipkg-utils/patches/.svn/text-base/170-resolve_conffiles.patch.svn-base b/tools/ipkg-utils/patches/.svn/text-base/170-resolve_conffiles.patch.svn-base new file mode 100644 index 0000000..31faf30 --- /dev/null +++ b/tools/ipkg-utils/patches/.svn/text-base/170-resolve_conffiles.patch.svn-base @@ -0,0 +1,23 @@ +--- a/ipkg-build ++++ b/ipkg-build +@@ -160,12 +160,15 @@ You probably want to chown these to a sy + done + + if [ -f $CONTROL/conffiles ]; then +- for cf in `cat $CONTROL/conffiles`; do +- if [ ! -f ./$cf ]; then +- echo "*** Error: $CONTROL/conffiles mentions conffile $cf which does not exist" >&2 +- PKG_ERROR=1 +- fi ++ rm -f $CONTROL/conffiles.resolved ++ ++ for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) -type f`; do ++ echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved + done ++ ++ rm $CONTROL/conffiles ++ mv $CONTROL/conffiles.resolved $CONTROL/conffiles ++ chmod 0644 $CONTROL/conffiles + fi + + cd $owd |