aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-08-06 21:29:23 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-08-06 21:29:23 +0000
commit4a7b2363a21e3e29d074fa12a1f813d3af269ba4 (patch)
tree77040e63c993f78c274de2fcc7935fc03d5c8a99
parentc9d85717342e29280df036939b010dd6615ef190 (diff)
downloadupstream-4a7b2363a21e3e29d074fa12a1f813d3af269ba4.tar.gz
upstream-4a7b2363a21e3e29d074fa12a1f813d3af269ba4.tar.bz2
upstream-4a7b2363a21e3e29d074fa12a1f813d3af269ba4.zip
[include] support unpacking of .tar.xz archives, no prereq on xzcat for now
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22517 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/unpack.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/unpack.mk b/include/unpack.mk
index 2cd17817e6..0151675777 100644
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -32,7 +32,11 @@ ifeq ($(strip $(UNPACK_CMD)),)
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
DECOMPRESS_CMD:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
- ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1))
+ ifeq ($(filter xz txz,$(EXT)),$(EXT))
+ EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+ DECOMPRESS_CMD:=xzcat $(DL_DIR)/$(PKG_SOURCE) |
+ endif
+ ifeq ($(filter tgz tbz tbz2 txz,$(EXT1)),$(EXT1))
EXT:=tar
endif
DECOMPRESS_CMD ?= cat $(DL_DIR)/$(PKG_SOURCE) |