X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Funpack.mk;h=94124e9ec6c3fcdb3f680b146b141d176dd69bd5;hb=e225f119a7b136639695da38345d0c4d78abe2ea;hp=051846bd2fdee54760edee00335f9205cd953e56;hpb=97c8cb1b64a660538b7ef6cf5a9b98f904a8bccc;p=openwrt-10.03%2F.git 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