sync TAR_OPTIONS usage with kamikaze to keep sdk compatible

SVN-Revision: 5580

diff --git a/openwrt/package/microcom/Makefile b/openwrt/package/microcom/Makefile
index b6b2ac1e22eb216103885d72d3467133dabfb6eb..07cc55dbec9fe28c0d9d335dd89912b9dfccf3a2 100644 (file)
--- 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 b3f4cdbea9b7c328d689aee886a560f202121f64..43bdcc8709125bd5eec8cc3ee0c830295c1857bd 100644 (file)
--- 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 1885705d6d70e4e4262ac2fee4507d34f7fe62ff..e7b6ff81d5f303ad92ce89851dd3c014d567047f 100644 (file)
--- 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 e46e6c4efe50e0e979e5927598ed19ea5a120238..a80ee30f97f3677aa473ba26750c5c020c82b696 100644 (file)
--- 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 d6edb8cac4ecfa856e1db465fdf5749fa2b9be74..ee465b54f1a7f74b4e81c5c88991eb9054fc19e1 100644 (file)
--- 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 6f0f0a1f766615932b5a64ae09798b479d3e2bc7..f7de1718b850af8e2d84ad8481c0a5a55d49a00d 100644 (file)
--- 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 d3621bd94985ca2d9399c62989d5cba29a869b31..debad845b6059b1f4b9a606aaf72bc60c408e0eb 100644 (file)
--- 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 806ecd05fb0f8507ad1832f9b355e04a7be8843b..b228ab0fadd102ae913ef316be413a177022f1b2 100644 (file)
--- 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 1d7c8650ff5ff93d00b2aaf197144375061ffbb1..fae520c3ec9890d2bedd4e149bdcd9f1a341aafb 100644 (file)
--- 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 2dd11aa78ddce64545d687801d73fef95a5c9d43..65e38f75f648fd1d77415bfc0250465b75bbbf6e 100644 (file)
--- 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 41c78fc24e1d10fdc6fd6bd1d7087b26d088c487..1970e66854be778ea566b8096f3036e7a53fbc6d 100644 (file)
--- 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 d7b9746abaa03488bfb20e9325adf28fc9affad7..0e46ee4ceefa1e6673cc8d679547ae2fa6cb7b52 100644 (file)
--- 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 637bc6597b3b254d1cde0dc2d0e022e7ee2a83a8..b14689eec0693358ab5187addf7a0f310c8f6fbc 100644 (file)
--- 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 e5f8d44f0424e9738e22eb4351bf1608ee284a7e..ca0e2cc48faa2ace7c6913ebb3f77caa62a45af7 100644 (file)
--- 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