projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: set TMPDIR for opkg calls
[librecmc/librecmc.git]
/
include
/
unpack.mk
diff --git
a/include/unpack.mk
b/include/unpack.mk
index ae8cdecb271ef1e760df78e365209a4cf4439c00..3fabf460336b711a8e413927c901c8a581a7eb46 100644
(file)
--- a/
include/unpack.mk
+++ b/
include/unpack.mk
@@
-1,4
+1,4
@@
-#
+#
# Copyright (C) 2006-2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# Copyright (C) 2006-2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@@
-16,7
+16,8
@@
UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE)
ifeq ($(PKG_SOURCE),)
PKG_UNPACK ?= true
ifeq ($(PKG_SOURCE),)
PKG_UNPACK ?= true
-endif
+else
+
ifeq ($(strip $(UNPACK_CMD)),)
ifeq ($(strip $(PKG_CAT)),)
# try to autodetect file type
ifeq ($(strip $(UNPACK_CMD)),)
ifeq ($(strip $(PKG_CAT)),)
# try to autodetect file type
@@
-31,7
+32,11
@@
ifeq ($(strip $(UNPACK_CMD)),)
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
DECOMPRESS_CMD:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
DECOMPRESS_CMD:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
- ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1))
+ ifeq ($(filter xz txz,$(EXT)),$(EXT))
+ EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+ DECOMPRESS_CMD:=xzcat $(DL_DIR)/$(PKG_SOURCE) |
+ endif
+ ifeq ($(filter tgz tbz tbz2 txz,$(EXT1)),$(EXT1))
EXT:=tar
endif
DECOMPRESS_CMD ?= cat $(DL_DIR)/$(PKG_SOURCE) |
EXT:=tar
endif
DECOMPRESS_CMD ?= cat $(DL_DIR)/$(PKG_SOURCE) |
@@
-64,9
+69,13
@@
ifeq ($(strip $(UNPACK_CMD)),)
CRLF_CMD :=
endif
endif
CRLF_CMD :=
endif
endif
+
ifdef PKG_BUILD_DIR
ifdef PKG_BUILD_DIR
- PKG_UNPACK
:=
$(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR))
+ PKG_UNPACK
?= $(SH_FUNC)
$(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR))
endif
ifdef HOST_BUILD_DIR
endif
ifdef HOST_BUILD_DIR
- HOST_UNPACK
:=
$(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR))
+ HOST_UNPACK
?= $(SH_FUNC)
$(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR))
endif
endif
+
+endif # PKG_SOURCE
+