X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fipkg-utils%2Fpatches%2F170-resolve_conffiles.patch;fp=tools%2Fipkg-utils%2Fpatches%2F170-resolve_conffiles.patch;h=31faf30a0394ceebbab36a50bacd02bdff171fdc;hb=3341e1ece73734ce966aa613718af0f24d54f2f9;hp=0000000000000000000000000000000000000000;hpb=650029f14b5320644fe8e703b5b839f40c6078a3;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/tools/ipkg-utils/patches/170-resolve_conffiles.patch b/tools/ipkg-utils/patches/170-resolve_conffiles.patch
new file mode 100644
index 0000000000..31faf30a03
--- /dev/null
+++ b/tools/ipkg-utils/patches/170-resolve_conffiles.patch
@@ -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