From 3341e1ece73734ce966aa613718af0f24d54f2f9 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 5 Oct 2010 19:18:15 +0000
Subject: [PATCH] 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
---
 .../patches/170-resolve_conffiles.patch       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 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
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