partially revert "build: remove check for nonexistant CONFIG_TAR_VERBOSITY variable...

This complicates the evaluation order for some packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40006 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index d81dc76..caaa09d 100644 (file)
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -31,7 +31,7 @@ Kernel/Patch:=$(Kernel/Patch/Default)
 ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
   ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
     define Kernel/Prepare/Default
-       xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) -xf -
+       xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
        $(Kernel/Patch)
        touch $(LINUX_DIR)/.quilt_used
     endef

diff --git a/include/unpack.mk b/include/unpack.mk
index 2b33c4c..2d35863 100644 (file)
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -11,8 +11,6 @@ ifneq ($(HOST_OS),Linux)
 else
   HOST_TAR:=$(TAR)
 endif
-
-TAR_OPTIONS:=-xf -
 TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
 UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE)
 

diff --git a/rules.mk b/rules.mk
index cccbf3a..a84636a 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -263,6 +263,8 @@ else
   DISABLE_IPV6:=--disable-ipv6
 endif
 
+TAR_OPTIONS:=-xf -
+
 ifeq ($(CONFIG_BUILD_LOG),y)
   BUILD_LOG:=1
 endif