1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-15 17:49:42 +02:00
openwrt-xburst/tools/ipkg-utils/patches/170-resolve_conffiles.patch
jow 999a4c2891 [tools] ipkg-utils: don't fail if conffiles do not exist, resolve them instead and silently skip not existing files.
This prepares support for sysupgrade hints using to build the keepfile list.
Subsequent commits will rely on this feature - a rebuild of tools/ipkg-utils is necessary!


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23256 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-05 19:18:15 +00:00

24 lines
640 B
Diff

--- 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