another bsd bugfix

SVN-Revision: 5657
master
Felix Fietkau 18 years ago
parent 387570cc06
commit 461375c939
  1. 8
      include/unpack.mk
  2. 2
      toolchain/kernel-headers/Makefile

@ -1,16 +1,18 @@
ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(strip $(PKG_UNPACK)),)
ifneq ($(HOST_OS),Linux) ifneq ($(HOST_OS),Linux)
TAR := trapret 2 $(PKG_UNPACK) $(TAR) HOST_TAR:=trapret 2 $(TAR)
else
HOST_TAR:=$(TAR)
endif endif
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) | $(HOST_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) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
endif endif
else else
# try to autodetect file type # try to autodetect file type

@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Build/Prepare define Build/Prepare
mkdir -p $(TOOLCHAIN_BUILD_DIR) 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 $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR) ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)

Loading…
Cancel
Save