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/120-build_tar.patch | |
| parent | 5d8c92d1db176cca2bd1cd025c2700bd89a174d3 (diff) | |
| download | upstream-083034a599d882b2570d64d23c30aeb86c71397e.tar.gz upstream-083034a599d882b2570d64d23c30aeb86c71397e.tar.bz2 upstream-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/120-build_tar.patch')
| -rw-r--r-- | tools/ipkg-utils/patches/120-build_tar.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/tools/ipkg-utils/patches/120-build_tar.patch b/tools/ipkg-utils/patches/120-build_tar.patch deleted file mode 100644 index acf6b79853..0000000000 --- a/tools/ipkg-utils/patches/120-build_tar.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch from aorlinsk fixes an issue with order in options passed to tar - - http://openwrt.org/forum/viewtopic.php?pid=8332#p8332 - - ---- a/ipkg-build -+++ b/ipkg-build -@@ -184,7 +184,7 @@ while getopts "cg:ho:v" opt; do - g ) group=$OPTARG - ogargs="$ogargs --group=$group" - ;; -- c ) outer=tar -+ c ) outer=$TAR - ;; - C ) noclean=1 - ;; -@@ -243,8 +243,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$ - mkdir $tmp_dir - - echo $CONTROL > $tmp_dir/tarX --( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX ) --( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . ) -+( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . ) -+( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . ) - rm $tmp_dir/tarX - - echo "2.0" > $tmp_dir/debian-binary -@@ -254,7 +254,7 @@ rm -f $pkg_file - if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) - else -- ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) -+ ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) - fi - - rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz |