[backfire] merge r23256, r23257 and r23258

[openwrt-10.03/.git] / tools / ipkg-utils / patches / 170-resolve_conffiles.patch

diff --git a/tools/ipkg-utils/patches/170-resolve_conffiles.patch b/tools/ipkg-utils/patches/170-resolve_conffiles.patch
new file mode 100644 (file)
index 0000000..31faf30
--- /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