mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 04:48:57 +02:00
fix mistakes in unpack change
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5077 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a423169db4
commit
1cbc384d56
@ -8,9 +8,9 @@
|
||||
include $(INCLUDE_DIR)/host.mk
|
||||
include $(INCLUDE_DIR)/unpack.mk
|
||||
|
||||
ifneq ($(strip $(UNPACK)),)
|
||||
ifneq ($(strip $(PKG_UNPACK)),)
|
||||
define Build/Prepare/Default
|
||||
$(UNPACK)
|
||||
$(PKG_UNPACK)
|
||||
@if [ -d ./patches ]; then \
|
||||
$(PATCH) $(PKG_BUILD_DIR) ./patches; \
|
||||
fi
|
||||
|
@ -272,7 +272,7 @@ endef
|
||||
|
||||
ifneq ($(strip $(PKG_UNPACK)),)
|
||||
define Build/Prepare/Default
|
||||
$(UNPACK)
|
||||
$(PKG_UNPACK)
|
||||
@if [ -d ./patches ]; then \
|
||||
$(PATCH) $(PKG_BUILD_DIR) ./patches; \
|
||||
fi
|
||||
|
@ -1,13 +1,13 @@
|
||||
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) -
|
||||
PKG_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)
|
||||
PKG_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) -
|
||||
PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
|
||||
endif
|
||||
else
|
||||
# try to autodetect file type
|
||||
|
Loading…
Reference in New Issue
Block a user