mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-23 07:03:44 +00:00
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!
SVN-Revision: 23256
This commit is contained in:
parent
650029f14b
commit
3341e1ece7
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