diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-06-30 12:21:58 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-06-30 12:21:58 +0000 |
| commit | 6630372cc899d243b22de133f2aeec28c3fd5239 (patch) | |
| tree | 83b14652c374ff919552c8f844dc90b5d6eeffa7 /tools | |
| parent | b6c8961dce55514c22490d4915626e0d64f11ba8 (diff) | |
add portability fixes from #1720
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7791 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ipkg-utils/patches/120-build_tar.patch | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/tools/ipkg-utils/patches/120-build_tar.patch b/tools/ipkg-utils/patches/120-build_tar.patch index 441d3adf0..299d68f4e 100644 --- a/tools/ipkg-utils/patches/120-build_tar.patch +++ b/tools/ipkg-utils/patches/120-build_tar.patch @@ -3,14 +3,36 @@ This patch from aorlinsk fixes an issue with order in options passed to tar http://openwrt.org/forum/viewtopic.php?pid=8332#p8332 ---- ipkg-utils-1.7/ipkg-build.orig 2005-06-14 23:48:36.000000000 +0200 -+++ ipkg-utils-1.7/ipkg-build 2005-06-14 23:50:03.000000000 +0200 -@@ -243,7 +243,7 @@ +Index: ipkg-utils-1.7/ipkg-build +=================================================================== +--- ipkg-utils-1.7.orig/ipkg-build 2007-06-30 14:19:16.519409000 +0200 ++++ ipkg-utils-1.7/ipkg-build 2007-06-30 14:20:12.722921500 +0200 +@@ -184,7 +184,7 @@ + g ) group=$OPTARG + ogargs="$ogargs --group=$group" + ;; +- c ) outer=tar ++ c ) outer=$TAR + ;; + C ) noclean=1 + ;; +@@ -243,8 +243,8 @@ 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 && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . ) - ( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . ) +-( 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 @@ + 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 |