X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fipkg-utils%2Fpatches%2F140-portability.patch;h=417c4094d4db09eea5a26e187ab87b3351ebc924;hb=bbc6ab0a0317f5707638956866b87f7bca656e62;hp=5ba06b3a45e78b7c1fed6c85e148a0e8d43f7425;hpb=f52d66ff00b24111f87c274d3d7085ef2e1d27b1;p=openwrt-10.03%2F.git

diff --git a/tools/ipkg-utils/patches/140-portability.patch b/tools/ipkg-utils/patches/140-portability.patch
index 5ba06b3a4..417c4094d 100644
--- a/tools/ipkg-utils/patches/140-portability.patch
+++ b/tools/ipkg-utils/patches/140-portability.patch
@@ -1,7 +1,6 @@
-diff -ur ipkg.old/ipkg-build ipkg.dev/ipkg-build
---- ipkg.old/ipkg-build	Tue Oct 10 22:52:58 2006
-+++ ipkg.dev/ipkg-build	Tue Oct 10 22:56:32 2006
-@@ -11,6 +11,8 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -11,6 +11,8 @@ set -e
  
  version=1.0
  
@@ -10,38 +9,8 @@ diff -ur ipkg.old/ipkg-build ipkg.dev/ipkg-build
  ipkg_extract_value() {
  	sed -e "s/^[^:]*:[[:space:]]*//"
  }
-@@ -184,7 +186,7 @@
- 	g ) group=$OPTARG
- 	    ogargs="$ogargs --group=$group"
- 	    ;;
--        c ) outer=tar
-+        c ) outer=$TAR
-             ;;
-         C ) noclean=1
-             ;;
-@@ -243,8 +245,8 @@
- mkdir $tmp_dir
- 
- echo $CONTROL > $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 && $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 +256,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
-diff -ur ipkg.old/ipkg-make-index ipkg.dev/ipkg-make-index
---- ipkg.old/ipkg-make-index	Tue Oct 10 22:52:58 2006
-+++ ipkg.dev/ipkg-make-index	Tue Oct 10 22:57:53 2006
+--- a/ipkg-make-index
++++ b/ipkg-make-index
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/env python