diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-16 20:21:39 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-16 20:21:39 +0000 |
commit | 643f013d152805f989115a71a8d19b02d01320a4 (patch) | |
tree | a3d325d614e1925db50f97bb3c5196d30519a463 /include | |
parent | a5b59b1fbf989b5e9fa6df6779a862af7bb31fa5 (diff) |
add file type autodetection for the unpack command and nuke PKG_CAT:= in lots of places
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6582 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r-- | include/unpack.mk | 57 |
1 files changed, 47 insertions, 10 deletions
diff --git a/include/unpack.mk b/include/unpack.mk index 7813e3b3d3..10e6c25bf5 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -1,21 +1,58 @@ +ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1))) + +# unpacking files with +s may break on some platforms. this typically emits error code 2 +ifneq ($(HOST_OS),Linux) + HOST_TAR:=trapret 2 $(TAR) +else + HOST_TAR:=$(TAR) +endif +TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) +UNZIP_CMD:=unzip -d $(PKG_BUILD_DIR)/.. $(DL_DIR)/$(PKG_SOURCE) + +ifeq ($(PKG_SOURCE),) + PKG_UNPACK ?= true +endif ifeq ($(strip $(PKG_UNPACK)),) - ifneq ($(HOST_OS),Linux) - HOST_TAR:=trapret 2 $(TAR) - else - HOST_TAR:=$(TAR) + ifeq ($(strip $(PKG_CAT)),) + # try to autodetect file type + EXT:=$(call ext,$(PKG_SOURCE)) + EXT1:=$(EXT) + + ifeq ($(filter gz tgz,$(EXT)),$(EXT)) + EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) + UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | + endif + ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT)) + EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) + UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | + endif + ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1)) + $(error FOO: $(filter tgz tbz tbz2,$(EXT1)),$(EXT1)) + EXT:=tar + endif + UNPACK ?= cat $(DL_DIR)/$(PKG_SOURCE) | + ifeq ($(EXT),tar) + PKG_UNPACK:=$(UNPACK) $(TAR_CMD) + endif + ifeq ($(EXT),cpio) + PKG_UNPACK:=$(UNPACK) (cd $(PKG_BUILD_DIR)/..; cpio -i -d) + endif + ifeq ($(EXT),zip) + PKG_UNPACK:=$(UNZIP_CMD) + endif endif - ifneq ($(strip $(PKG_CAT)),) + + # compatibility code for packages that set PKG_CAT + ifeq ($(strip $(PKG_CAT)$(PKG_UNPACK)),) # use existing PKG_CAT - PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) + PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) ifeq ($(PKG_CAT),unzip) - PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/.. $(DL_DIR)/$(PKG_SOURCE) + PKG_UNPACK:=$(UNZIP_CMD) endif # replace zcat with $(ZCAT), because some system have it as gzcat ifeq ($(PKG_CAT),zcat) - PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) + PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) endif - else - # try to autodetect file type endif ifneq ($(strip $(CRLF_WORKAROUND)),) PKG_UNPACK += && find $(PKG_BUILD_DIR) -type f -print0 | xargs -0 perl -pi -e 's!\r$$$$!!g' |