mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 22:59:40 +02:00
[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
This commit is contained in:
parent
588525f607
commit
999a4c2891
23
tools/ipkg-utils/patches/170-resolve_conffiles.patch
Normal file
23
tools/ipkg-utils/patches/170-resolve_conffiles.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user