From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 14 Oct 2006 14:51:48 +0000 (+0000)
Subject: move '-' parameter to TAR_OPTIONS, so that packages can append commands
X-Git-Tag: reboot~30696
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=06a46fb09dbfe233e828267565d6ba71cd0ecb11

move '-' parameter to TAR_OPTIONS, so that packages can append commands

SVN-Revision: 5083
---

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 5544a82e37..06f4ce7726 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -38,7 +38,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
 
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 	-mkdir -p $(KERNEL_BUILD_DIR)
-	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) -
+	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
 	touch $@
 
 ifeq ($(KERNEL),2.4)
diff --git a/include/unpack.mk b/include/unpack.mk
index 4f1f243806..e56f624152 100644
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -1,13 +1,13 @@
 ifeq ($(strip $(PKG_UNPACK)),)
   ifneq ($(strip $(PKG_CAT)),)
     # use existing PKG_CAT
-    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
     ifeq ($(PKG_CAT),unzip)
       PKG_UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
     endif
     # replace zcat with $(ZCAT), because some system have it as gzcat
     ifeq ($(PKG_CAT),zcat)
-      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
     endif
   else
     # try to autodetect file type
diff --git a/rules.mk b/rules.mk
index be269e77f3..96a54c9fea 100644
--- a/rules.mk
+++ b/rules.mk
@@ -106,9 +106,9 @@ ifneq ($(CONFIG_LARGEFILE),y)
 endif
 
 ifeq ($(CONFIG_TAR_VERBOSITY),y)
-  TAR_OPTIONS=-xvf
+  TAR_OPTIONS=-xvf -
 else
-  TAR_OPTIONS=-xf
+  TAR_OPTIONS=-xf -
 endif
 
 all: