diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-05 10:35:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-05 10:35:12 +0000 |
| commit | b755dc66dfca48518b24450277173be4671fcde5 (patch) | |
| tree | 9ec34b345812849e80fc2c4a040cd284b2174551 | |
| parent | e2e25f95f43274f5d933a7d54d084a5a18bd41cd (diff) | |
simplify handling of zcat - always use gzip -dc. zcat and gzcat are either broken or nonexistant on some systems
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7096 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/host.mk | 3 | ||||
| -rw-r--r-- | include/unpack.mk | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/host.mk b/include/host.mk index 8b4ce3d24..833aa83a6 100644 --- a/include/host.mk +++ b/include/host.mk @@ -28,9 +28,6 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk TAR=`which gtar 2>/dev/null`; \ [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ echo "TAR:=$$TAR" >> $@; \ - ZCAT=`which gzcat 2>/dev/null`; \ - [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat 2>/dev/null`; \ - echo "ZCAT:=$$ZCAT" >> $@; \ echo "BASH:=$(shell which bash)" >> $@; \ ) diff --git a/include/unpack.mk b/include/unpack.mk index b8349c9ca..500aada46 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -20,7 +20,7 @@ ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(filter gz tgz,$(EXT)),$(EXT)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) - UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | + UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | endif ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) @@ -48,9 +48,9 @@ ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(PKG_CAT),unzip) PKG_UNPACK:=$(UNZIP_CMD) endif - # replace zcat with $(ZCAT), because some system have it as gzcat + # replace zcat with $(ZCAT), because some system don't support it properly ifeq ($(PKG_CAT),zcat) - PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) + PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) endif endif ifneq ($(strip $(CRLF_WORKAROUND)),) |