qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:29:41 +02:00
Code

fix mistakes in unpack change

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5077 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-10-14 13:04:50 +00:00
parent a423169db4
commit 1cbc384d56
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/host-build.mk
View File

@ -8,9 +8,9 @@
include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/unpack.mk
ifneq ($(strip $(UNPACK)),) ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default define Build/Prepare/Default
$(UNPACK) $(PKG_UNPACK)
@if [ -d ./patches ]; then \ @if [ -d ./patches ]; then \
$(PATCH) $(PKG_BUILD_DIR) ./patches; \ $(PATCH) $(PKG_BUILD_DIR) ./patches; \
fi fi

2
include/package.mk
View File

@ -272,7 +272,7 @@ endef
ifneq ($(strip $(PKG_UNPACK)),) ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default define Build/Prepare/Default
$(UNPACK) $(PKG_UNPACK)
@if [ -d ./patches ]; then \ @if [ -d ./patches ]; then \
$(PATCH) $(PKG_BUILD_DIR) ./patches; \ $(PATCH) $(PKG_BUILD_DIR) ./patches; \
fi fi

6
include/unpack.mk
View File

@ -1,13 +1,13 @@
ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(strip $(PKG_UNPACK)),)
ifneq ($(strip $(PKG_CAT)),) ifneq ($(strip $(PKG_CAT)),)
# use existing 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) 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 endif
# replace zcat with $(ZCAT), because some system have it as gzcat # replace zcat with $(ZCAT), because some system have it as gzcat
ifeq ($(PKG_CAT),zcat) 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 endif
else else
# try to autodetect file type # try to autodetect file type