qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 17:40:16 +02:00
Code

simplify handling of zcat - always use gzip -dc. zcat and gzcat are either broken or nonexistant on some systems

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7096 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-05-05 10:35:12 +00:00
parent e2e25f95f4
commit b755dc66df
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/host.mk
View File

@ -28,9 +28,6 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
TAR=`which gtar 2>/dev/null`; \ TAR=`which gtar 2>/dev/null`; \
[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
echo "TAR:=$$TAR" >> $@; \ 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)" >> $@; \ echo "BASH:=$(shell which bash)" >> $@; \
) )

6
include/unpack.mk
View File

@ -20,7 +20,7 @@ ifeq ($(strip $(PKG_UNPACK)),)
ifeq ($(filter gz tgz,$(EXT)),$(EXT)) ifeq ($(filter gz tgz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) |
endif endif
ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT)) ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
@ -48,9 +48,9 @@ ifeq ($(strip $(PKG_UNPACK)),)
ifeq ($(PKG_CAT),unzip) ifeq ($(PKG_CAT),unzip)
PKG_UNPACK:=$(UNZIP_CMD) PKG_UNPACK:=$(UNZIP_CMD)
endif 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) 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
endif endif
ifneq ($(strip $(CRLF_WORKAROUND)),) ifneq ($(strip $(CRLF_WORKAROUND)),)