summaryrefslogtreecommitdiff
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
commit627e974c99ae27e8fd3db0e17c2df4d85f8975fa (patch)
treec016d82c96308726e4810f7147465ecb488f2249
parentabd13cd85b1f1c6699e4b3d2bb268bb7b860f01e (diff)
downloadmtk-20170518-627e974c99ae27e8fd3db0e17c2df4d85f8975fa.zip
mtk-20170518-627e974c99ae27e8fd3db0e17c2df4d85f8975fa.tar.gz
mtk-20170518-627e974c99ae27e8fd3db0e17c2df4d85f8975fa.tar.bz2
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 SVN-Revision: 40006
-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 d81dc76..caaa09d 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 2b33c4c..2d35863 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 cccbf3a..a84636a 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