aboutsummaryrefslogtreecommitdiffstats
path: root/include/unpack.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-16 20:21:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-16 20:21:39 +0000
commit24faf55360271cd0bfc4751753384f9210d52f7f (patch)
treea31011a8788b2992f5b71b44605c598f156fee88 /include/unpack.mk
parent198a3ae713cb42dc53d71de733dab853dca65542 (diff)
downloadupstream-24faf55360271cd0bfc4751753384f9210d52f7f.tar.gz
upstream-24faf55360271cd0bfc4751753384f9210d52f7f.tar.bz2
upstream-24faf55360271cd0bfc4751753384f9210d52f7f.zip
add file type autodetection for the unpack command and nuke PKG_CAT:= in lots of places
SVN-Revision: 6582
Diffstat (limited to 'include/unpack.mk')
-rw-r--r--include/unpack.mk57
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'