mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 16:43:09 +02:00
move common unpacking code to unpack.mk, replace zcat with $(ZCAT) for systems that use gzcat instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5070 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
79a17f08d7
commit
f6777ece94
@ -6,13 +6,9 @@
|
||||
#
|
||||
|
||||
include $(INCLUDE_DIR)/host.mk
|
||||
include $(INCLUDE_DIR)/unpack.mk
|
||||
|
||||
ifneq ($(strip $(PKG_CAT)),)
|
||||
ifeq ($(PKG_CAT),unzip)
|
||||
UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
|
||||
else
|
||||
UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
|
||||
endif
|
||||
ifneq ($(strip $(UNPACK)),)
|
||||
define Build/Prepare/Default
|
||||
$(UNPACK)
|
||||
@if [ -d ./patches ]; then \
|
||||
|
@ -28,5 +28,8 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
|
||||
if $$TAR --version 2>&1 | grep 'GNU' >/dev/null; then \
|
||||
echo "TAR_WILDCARDS:=--wildcards" >> $@; \
|
||||
fi; \
|
||||
ZCAT=`which gzcat`; \
|
||||
[ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \
|
||||
echo "ZCAT:=$$ZCAT" >> $@; \
|
||||
)
|
||||
|
||||
|
@ -12,6 +12,7 @@ endif
|
||||
|
||||
include $(INCLUDE_DIR)/prereq.mk
|
||||
include $(INCLUDE_DIR)/host.mk
|
||||
include $(INCLUDE_DIR)/unpack.mk
|
||||
|
||||
define shvar
|
||||
V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
|
||||
@ -269,12 +270,7 @@ define BuildPackage
|
||||
endif
|
||||
endef
|
||||
|
||||
ifneq ($(strip $(PKG_CAT)),)
|
||||
ifeq ($(PKG_CAT),unzip)
|
||||
UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
|
||||
else
|
||||
UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
|
||||
endif
|
||||
ifneq ($(strip $(PKG_UNPACK)),)
|
||||
define Build/Prepare/Default
|
||||
$(UNPACK)
|
||||
@if [ -d ./patches ]; then \
|
||||
|
15
include/unpack.mk
Normal file
15
include/unpack.mk
Normal file
@ -0,0 +1,15 @@
|
||||
ifeq ($(strip $(PKG_UNPACK)),)
|
||||
ifneq ($(strip $(PKG_CAT)),)
|
||||
# use existing PKG_CAT
|
||||
UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
|
||||
ifeq ($(PKG_CAT),unzip)
|
||||
UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
|
||||
endif
|
||||
# replace zcat with $(ZCAT), because some system have it as gzcat
|
||||
ifeq ($(PKG_CAT),zcat)
|
||||
UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
|
||||
endif
|
||||
else
|
||||
# try to autodetect file type
|
||||
endif
|
||||
endif
|
Loading…
Reference in New Issue
Block a user