From 55c5d10ca9c98ef8424d939aa950a04d30cbbe24 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 29 Mar 2015 07:35:26 +0000 Subject: tools: replace ipkg-utils with a reduced ipkg-build variant in scripts/ Signed-off-by: Felix Fietkau SVN-Revision: 45129 --- .../ipkg-utils/patches/170-resolve_conffiles.patch | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 tools/ipkg-utils/patches/170-resolve_conffiles.patch (limited to '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 deleted file mode 100644 index 31faf30a03..0000000000 --- a/tools/ipkg-utils/patches/170-resolve_conffiles.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 -- cgit v1.2.3