diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-11-27 05:23:22 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-11-27 05:23:22 +0000 |
| commit | b3e588c735435c1cb5ee49de9fa6f63e04408111 (patch) | |
| tree | c24ec294d5a536f38c4ffac9dba659a0cba8bc16 | |
| parent | 97c8cb1b64a660538b7ef6cf5a9b98f904a8bccc (diff) | |
another bsd bugfix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5657 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/unpack.mk | 8 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/unpack.mk b/include/unpack.mk index 051846bd2..94124e9ec 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -1,16 +1,18 @@ ifeq ($(strip $(PKG_UNPACK)),) ifneq ($(HOST_OS),Linux) - TAR := trapret 2 $(PKG_UNPACK) $(TAR) + HOST_TAR:=trapret 2 $(TAR) + else + HOST_TAR:=$(TAR) endif ifneq ($(strip $(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) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) ifeq ($(PKG_CAT),unzip) PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) endif # replace zcat with $(ZCAT), because some system have it as gzcat 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) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) endif else # try to autodetect file type diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 027d6a852..47a55de57 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/host-build.mk define Build/Prepare mkdir -p $(TOOLCHAIN_BUILD_DIR) - bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) + bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR) |