diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 07:35:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 07:35:26 +0000 |
| commit | 083034a599d882b2570d64d23c30aeb86c71397e (patch) | |
| tree | c6865cd6127ad03058f728c1d527c9508c61a2e6 /tools/ipkg-utils/patches/170-resolve_conffiles.patch | |
| parent | 5d8c92d1db176cca2bd1cd025c2700bd89a174d3 (diff) | |
| download | master-187ad058-083034a599d882b2570d64d23c30aeb86c71397e.tar.gz master-187ad058-083034a599d882b2570d64d23c30aeb86c71397e.tar.bz2 master-187ad058-083034a599d882b2570d64d23c30aeb86c71397e.zip | |
tools: replace ipkg-utils with a reduced ipkg-build variant in scripts/
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45129 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/ipkg-utils/patches/170-resolve_conffiles.patch')
| -rw-r--r-- | tools/ipkg-utils/patches/170-resolve_conffiles.patch | 23 |
1 files changed, 0 insertions, 23 deletions
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 |