From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 21 Jul 2006 10:50:12 +0000 (+0000)
Subject: fix problems with new tar versions, closes #628 and #646
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cd9991c2b2abad85cad5ddf78f7966668c73ce29;p=openwrt%2Fstaging%2Fnbd.git

fix problems with new tar versions, closes #628 and #646

SVN-Revision: 4185
---

diff --git a/openwrt/toolchain/ipkg-utils/patches/130-tar_wildcards.patch b/openwrt/toolchain/ipkg-utils/patches/130-tar_wildcards.patch
new file mode 100644
index 0000000000..80a7d1db61
--- /dev/null
+++ b/openwrt/toolchain/ipkg-utils/patches/130-tar_wildcards.patch
@@ -0,0 +1,23 @@
+--- 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
diff --git a/openwrt/toolchain/kernel-headers/Makefile b/openwrt/toolchain/kernel-headers/Makefile
index 7e08508b63..da525d5f37 100644
--- a/openwrt/toolchain/kernel-headers/Makefile
+++ b/openwrt/toolchain/kernel-headers/Makefile
@@ -31,7 +31,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
 
 define Build/Prepare
 	mkdir -p $(TOOL_BUILD_DIR)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | tar --wildcards -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
 		linux-$(PKG_VERSION)/include \
 		linux-$(PKG_VERSION)/Makefile \
 		linux-$(PKG_VERSION)/Rules.make \