From a723361df9cb4cb58d7e806218d98df72d57cdae Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 27 Sep 2006 14:06:46 +0000
Subject: move tools from toolchain/ to tools/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4866 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/ipkg-utils/patches/100-build_clean.patch | 36 ----------------------
 .../ipkg-utils/patches/110-buildpackage.patch      | 24 ---------------
 toolchain/ipkg-utils/patches/120-build_tar.patch   | 16 ----------
 .../ipkg-utils/patches/130-tar_wildcards.patch     | 23 --------------
 4 files changed, 99 deletions(-)
 delete mode 100644 toolchain/ipkg-utils/patches/100-build_clean.patch
 delete mode 100644 toolchain/ipkg-utils/patches/110-buildpackage.patch
 delete mode 100644 toolchain/ipkg-utils/patches/120-build_tar.patch
 delete mode 100644 toolchain/ipkg-utils/patches/130-tar_wildcards.patch

(limited to 'toolchain/ipkg-utils/patches')

diff --git a/toolchain/ipkg-utils/patches/100-build_clean.patch b/toolchain/ipkg-utils/patches/100-build_clean.patch
deleted file mode 100644
index 4cff731d5b..0000000000
--- a/toolchain/ipkg-utils/patches/100-build_clean.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build
---- ipkg-utils-1.7-old/ipkg-build	2004-08-24 04:56:12.000000000 +0200
-+++ ipkg-utils-1.7-new/ipkg-build	2004-08-24 04:55:49.000000000 +0200
-@@ -47,6 +47,19 @@
- 
- 	PKG_ERROR=0
- 
-+	cvs_dirs=`find . -name 'CVS'`
-+	if [ -n "$cvs_dirs" ]; then
-+	    if [ "$noclean" = "1" ]; then
-+		echo "*** Warning: The following CVS directories where found.
-+You probably want to remove them: " >&2
-+		ls -ld $cvs_dirs
-+		echo >&2
-+	    else
-+		echo "*** Removing the following files: $cvs_dirs"
-+		rm -rf "$cvs_dirs"
-+	    fi
-+	fi
-+
- 	tilde_files=`find . -name '*~'`
- 	if [ -n "$tilde_files" ]; then
- 	    if [ "$noclean" = "1" ]; then
-@@ -134,8 +147,12 @@
- 
- 	for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
- 		if [ -f $script -a ! -x $script ]; then
-+		    if [ "$noclean" = "1" ]; then
- 			echo "*** Error: package script $script is not executable" >&2
- 			PKG_ERROR=1
-+		    else
-+			chmod a+x $script
-+		    fi
- 		fi
- 	done
- 
diff --git a/toolchain/ipkg-utils/patches/110-buildpackage.patch b/toolchain/ipkg-utils/patches/110-buildpackage.patch
deleted file mode 100644
index d0a30489ae..0000000000
--- a/toolchain/ipkg-utils/patches/110-buildpackage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpackage
---- ipkg-utils-1.7-old/ipkg-buildpackage	2001-07-26 17:36:36.000000000 +0200
-+++ ipkg-utils-1.7-new/ipkg-buildpackage	2004-07-05 19:46:24.000000000 +0200
-@@ -30,8 +30,9 @@
- 
- set -e
- 
--#SCRIPTDIR=/usr/local/bin
--SCRIPTDIR=/other/kurth/ipaq-dev/familiar/dist/ipkg/util/
-+SCRIPTDIR=/usr/local/bin
-+
-+IPKG_BUILD_OPTIONS=$*
- 
- SCRIPTNAME=`basename $0`
- 
-@@ -212,7 +213,7 @@
- # build the ipk package
- owd=`pwd`
- cd ..
--ipkg-build /tmp/${pkg} || exit 1
-+ipkg-build $IPKG_BUILD_OPTIONS /tmp/${pkg} || exit 1
- 
- rm -rf /tmp/${pkg}
- 
diff --git a/toolchain/ipkg-utils/patches/120-build_tar.patch b/toolchain/ipkg-utils/patches/120-build_tar.patch
deleted file mode 100644
index 441d3adf04..0000000000
--- a/toolchain/ipkg-utils/patches/120-build_tar.patch
+++ /dev/null
@@ -1,16 +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
-
-
---- 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 @@
- 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 . )
- rm $tmp_dir/tarX
- 
diff --git a/toolchain/ipkg-utils/patches/130-tar_wildcards.patch b/toolchain/ipkg-utils/patches/130-tar_wildcards.patch
deleted file mode 100644
index 80a7d1db61..0000000000
--- a/toolchain/ipkg-utils/patches/130-tar_wildcards.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ipkg-utils-1.7/ipkg.py.orig	2006-06-29 14:16:00.000000000 +0200
-+++ ipkg-utils-1.7/ipkg.py	2006-06-29 14:36:01.000000000 +0200
-@@ -93,9 +93,9 @@
-             self.filename = os.path.basename(fn)
- 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
-             if self.isdeb:
--                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
-+                control = os.popen("ar p "+fn+" control.tar.gz | tar xzO --wildcards -f - '*control'","r")
-             else:
--                control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
-+                control = os.popen("tar xzO --wildcards -f "+fn+" '*control.tar.gz' | tar xzO --wildcards -f - '*control'","r")
-             line = control.readline()
-             while 1:
-                 if not line: break
-@@ -122,7 +122,7 @@
-             if self.isdeb:
-                 data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
-             else:
--                data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
-+                data = os.popen("tar xzO --wildcards -f "+fn+" '*data.tar.gz' | tar tfz -","r")
-             while 1:
-                 line = data.readline()
-                 if not line: break
-- 
cgit v1.2.3