use $(TAR) in unpack commands

SVN-Revision: 5078
master
Felix Fietkau 18 years ago
parent 794114c706
commit 4286347249
  1. 4
      include/unpack.mk
  2. 2
      toolchain/kernel-headers/Makefile

@ -1,13 +1,13 @@
ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(strip $(PKG_UNPACK)),)
ifneq ($(strip $(PKG_CAT)),) ifneq ($(strip $(PKG_CAT)),)
# use existing 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) ifeq ($(PKG_CAT),unzip)
PKG_UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) PKG_UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
endif endif
# replace zcat with $(ZCAT), because some system have it as gzcat # replace zcat with $(ZCAT), because some system have it as gzcat
ifeq ($(PKG_CAT),zcat) 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 endif
else else
# try to autodetect file type # try to autodetect file type

@ -32,7 +32,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
define Build/Prepare define Build/Prepare
mkdir -p $(TOOLCHAIN_BUILD_DIR) mkdir -p $(TOOLCHAIN_BUILD_DIR)
bzcat $(DL_DIR)/$(PKG_SOURCE) | tar $(TAR_WILDCARDS) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) - \ bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) $(TAR_WILDCARDS) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) - \
linux-$(PKG_VERSION)/include \ linux-$(PKG_VERSION)/include \
linux-$(PKG_VERSION)/Makefile \ linux-$(PKG_VERSION)/Makefile \
linux-$(PKG_VERSION)/Rules.make \ linux-$(PKG_VERSION)/Rules.make \

Loading…
Cancel
Save