From aa16faab30a43d8dc5b81555922fb9970c200a09 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 19 Nov 2006 00:23:57 +0000
Subject: [PATCH] sync TAR_OPTIONS usage with kamikaze to keep sdk compatible

SVN-Revision: 5580
---
 openwrt/package/microcom/Makefile                    | 2 +-
 openwrt/package/rules.mk                             | 2 +-
 openwrt/rules.mk                                     | 4 ++--
 openwrt/target/linux/image/brcm/lzma-loader/Makefile | 2 +-
 openwrt/target/linux/linux-2.4/Makefile              | 2 +-
 openwrt/target/linux/linux-2.4/broadcom.mk           | 2 +-
 openwrt/target/linux/package/nozomi/Makefile         | 2 +-
 openwrt/toolchain/binutils/Makefile                  | 2 +-
 openwrt/toolchain/gcc/Makefile                       | 2 +-
 openwrt/toolchain/gdb/Makefile                       | 2 +-
 openwrt/toolchain/ipkg-utils/Makefile                | 2 +-
 openwrt/toolchain/kernel-headers/Makefile            | 2 +-
 openwrt/toolchain/sed/Makefile                       | 2 +-
 openwrt/toolchain/uClibc/Makefile                    | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openwrt/package/microcom/Makefile b/openwrt/package/microcom/Makefile
index b6b2ac1e22..07cc55dbec 100644
--- a/openwrt/package/microcom/Makefile
+++ b/openwrt/package/microcom/Makefile
@@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.prepared:
 	rm -rf $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_BUILD_DIR)
 	# the .tar.gz is different - no subdirectory, so do this manually
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 	touch $@
 
 $(PKG_BUILD_DIR)/.configured:
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index b3f4cdbea9..43bdcc8709 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -51,7 +51,7 @@ ifneq ($(strip $(PKG_CAT)),)
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 	rm -rf $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_BUILD_DIR)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
 	if [ -d ./patches ]; then \
 		$(PATCH) $(PKG_BUILD_DIR) ./patches ; \
 	fi
diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index 1885705d6d..e7b6ff81d5 100644
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -37,9 +37,9 @@ endif
 
 
 ifeq ($(BR2_TAR_VERBOSITY),y)
-TAR_OPTIONS=-xvf
+TAR_OPTIONS=-xvf -
 else
-TAR_OPTIONS=-xf
+TAR_OPTIONS=-xf -
 endif
 
 ifneq ($(BR2_LARGEFILE),y)
diff --git a/openwrt/target/linux/image/brcm/lzma-loader/Makefile b/openwrt/target/linux/image/brcm/lzma-loader/Makefile
index e46e6c4efe..a80ee30f97 100644
--- a/openwrt/target/linux/image/brcm/lzma-loader/Makefile
+++ b/openwrt/target/linux/image/brcm/lzma-loader/Makefile
@@ -18,7 +18,7 @@ $(DL_DIR)/$(PKG_SOURCE_FILE):
 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
 	mkdir -p $(TOOL_BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS)
 	$(PATCH) $(PKG_BUILD_DIR) ./patches
 	touch $(PKG_BUILD_DIR)/.patched
 
diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index d6edb8cac4..ee465b54f1 100644
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -311,7 +311,7 @@ $(PACKAGE_DIR):
 
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 	-mkdir -p $(LINUX_BUILD_DIR)
-	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
+	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS)
 	rm -f $(LINUX_DIR)
 	ln -s $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
 	touch $(LINUX_DIR)/.unpacked
diff --git a/openwrt/target/linux/linux-2.4/broadcom.mk b/openwrt/target/linux/linux-2.4/broadcom.mk
index 6f0f0a1f76..f7de1718b8 100644
--- a/openwrt/target/linux/linux-2.4/broadcom.mk
+++ b/openwrt/target/linux/linux-2.4/broadcom.mk
@@ -29,7 +29,7 @@ $(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.drivers-unpacked
 
 $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER)
 	-mkdir -p $(BUILD_DIR)
-	zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS)
 	# copy binary wlan driver
 	mkdir -p $(LINUX_DIR)/drivers/net/wl
 	cp -a $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl
diff --git a/openwrt/target/linux/package/nozomi/Makefile b/openwrt/target/linux/package/nozomi/Makefile
index d3621bd949..debad845b6 100644
--- a/openwrt/target/linux/package/nozomi/Makefile
+++ b/openwrt/target/linux/package/nozomi/Makefile
@@ -21,7 +21,7 @@ $(PKG_BUILD_DIR)/.prepared:
 	rm -rf $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_BUILD_DIR)
 	# the .tgz is different - no subdirectory, so do this manually
-	zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -
+	zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 	if [ -d ./patches ]; then $(PATCH) $(PKG_BUILD_DIR) ./patches ; fi
 	cp -fpR ./src/* $(PKG_BUILD_DIR)/
 	touch $@
diff --git a/openwrt/toolchain/binutils/Makefile b/openwrt/toolchain/binutils/Makefile
index 806ecd05fb..b228ab0fad 100644
--- a/openwrt/toolchain/binutils/Makefile
+++ b/openwrt/toolchain/binutils/Makefile
@@ -58,7 +58,7 @@ $(DL_DIR)/$(BINUTILS_SOURCE):
 
 $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
-	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS)
 	touch $(BINUTILS_DIR)/.unpacked
 
 $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
diff --git a/openwrt/toolchain/gcc/Makefile b/openwrt/toolchain/gcc/Makefile
index 1d7c8650ff..fae520c3ec 100644
--- a/openwrt/toolchain/gcc/Makefile
+++ b/openwrt/toolchain/gcc/Makefile
@@ -61,7 +61,7 @@ $(DL_DIR)/$(GCC_SOURCE):
 
 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
-	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS)
 	touch $(GCC_DIR)/.unpacked
 
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
diff --git a/openwrt/toolchain/gdb/Makefile b/openwrt/toolchain/gdb/Makefile
index 2dd11aa78d..65e38f75f6 100644
--- a/openwrt/toolchain/gdb/Makefile
+++ b/openwrt/toolchain/gdb/Makefile
@@ -14,7 +14,7 @@ $(DL_DIR)/$(GDB_SOURCE):
 	$(WGET) -P $(DL_DIR) $(GDB_SITE)/$(GDB_SOURCE)
 
 $(GDB_DIR)/.patched: $(DL_DIR)/$(GDB_SOURCE)
-	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS)
 	$(PATCH) $(GDB_DIR) ./patches
 	# Copy a config.sub from gcc.  This is only necessary until
 	# gdb's config.sub supports <arch>-linux-uclibc tuples.
diff --git a/openwrt/toolchain/ipkg-utils/Makefile b/openwrt/toolchain/ipkg-utils/Makefile
index 41c78fc24e..1970e66854 100644
--- a/openwrt/toolchain/ipkg-utils/Makefile
+++ b/openwrt/toolchain/ipkg-utils/Makefile
@@ -22,7 +22,7 @@ $(DL_DIR)/$(PKG_SOURCE_FILE):
 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
 	mkdir -p $(BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS)
 	touch $(PKG_BUILD_DIR)/.unpacked
 
 $(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked
diff --git a/openwrt/toolchain/kernel-headers/Makefile b/openwrt/toolchain/kernel-headers/Makefile
index d7b9746aba..0e46ee4cee 100644
--- a/openwrt/toolchain/kernel-headers/Makefile
+++ b/openwrt/toolchain/kernel-headers/Makefile
@@ -22,7 +22,7 @@ $(DL_DIR)/$(LINUX_HEADERS_SOURCE):
 
 $(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
-	bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar --wildcards -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
+	bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar --wildcards -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) \
 		linux-$(LINUX_HEADERS_VERSION)/include \
 		linux-$(LINUX_HEADERS_VERSION)/Makefile \
 		linux-$(LINUX_HEADERS_VERSION)/Rules.make \
diff --git a/openwrt/toolchain/sed/Makefile b/openwrt/toolchain/sed/Makefile
index 637bc6597b..b14689eec0 100644
--- a/openwrt/toolchain/sed/Makefile
+++ b/openwrt/toolchain/sed/Makefile
@@ -31,7 +31,7 @@ $(DL_DIR)/$(SED_SOURCE):
 $(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
 	mkdir -p $(STAGING_DIR)/bin;
-	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS)
 	touch $(SED_DIR1)/.unpacked
 
 $(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
diff --git a/openwrt/toolchain/uClibc/Makefile b/openwrt/toolchain/uClibc/Makefile
index e5f8d44f04..ca0e2cc48f 100644
--- a/openwrt/toolchain/uClibc/Makefile
+++ b/openwrt/toolchain/uClibc/Makefile
@@ -41,7 +41,7 @@ $(DL_DIR)/$(UCLIBC_SOURCE):
 
 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
-	bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS)
 	$(PATCH) $(UCLIBC_DIR) ./patches
 	touch $(UCLIBC_DIR)/.unpacked
 
-- 
2.30.2