aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-22 19:52:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-22 19:52:48 +0000
commite7a9ff8b70948c34a9b1e844aeaf58438c8e853e (patch)
treecad6c9763ffdb9cef0fcf0af96bd556fa8bb6dc3
parent58933441da2741b8ff219762d9d42d04274c75bb (diff)
downloadmaster-187ad058-e7a9ff8b70948c34a9b1e844aeaf58438c8e853e.tar.gz
master-187ad058-e7a9ff8b70948c34a9b1e844aeaf58438c8e853e.tar.bz2
master-187ad058-e7a9ff8b70948c34a9b1e844aeaf58438c8e853e.zip
partially revert "build: remove check for nonexistant CONFIG_TAR_VERBOSITY variable and move TAR_OPTIONS to unpack.mk"
This complicates the evaluation order for some packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40006 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-defaults.mk2
-rw-r--r--include/unpack.mk2
-rw-r--r--rules.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index d81dc76135..caaa09d51d 100644
--- 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 2b33c4cd8e..2d35863095 100644
--- 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 cccbf3a73f..a84636a21b 100644
--- 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