KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

partially revert "build: remove check for nonexistant CONFIG_TAR_VERBOSITY variable and move TAR_OPTIONS to unpack.mk"

Browse source 
This complicates the evaluation order for some packages

SVN-Revision: 40006
This commit is contained in:
Felix Fietkau 2014-03-22 19:52:48 +00:00
parent abd13cd85b
commit 627e974c99
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/kernel-defaults.mk
View file

@ -31,7 +31,7 @@ Kernel/Patch:=$(Kernel/Patch/Default)
ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
define Kernel/Prepare/Default 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) $(Kernel/Patch)
touch $(LINUX_DIR)/.quilt_used touch $(LINUX_DIR)/.quilt_used
endef endef

2
include/unpack.mk
View file

@ -11,8 +11,6 @@ ifneq ($(HOST_OS),Linux)
else else
HOST_TAR:=$(TAR) HOST_TAR:=$(TAR)
endif endif
TAR_OPTIONS:=-xf -
TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS) TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE)

2
rules.mk
View file

@ -263,6 +263,8 @@ else
DISABLE_IPV6:=--disable-ipv6 DISABLE_IPV6:=--disable-ipv6
endif endif
TAR_OPTIONS:=-xf -
ifeq ($(CONFIG_BUILD_LOG),y) ifeq ($(CONFIG_BUILD_LOG),y)
BUILD_LOG:=1 BUILD_LOG:=1
endif endif