Since commit 5af113eb7c0f6e4b2d09e536e1a2adc4e2d6071d, LEDE's build
system contains overlay functionality, which allows to locally amend
properties of packages. When one wants to overlay certain properties
such as PKG_VERSION, the unpack command (UNPACK_CMD) uses the original
value rather than the overlaid one and unpacking fails.
Fix that problem by replacing simply expanded variable with
recursively expanded variable. This ensures that the unpack command
uses the overlaid values, because the variable expansion is deferred
after the overlay is loaded.
Signed-off-by: Michal Sojka <sojk...@fel.cvut.cz>
Signed-off-by: Michal Vokáč <michal.vo...@cvut.cz>
---
include/unpack.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/unpack.mk b/include/unpack.mk
index a139827490..6e4de7ec8e 100644
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -21,15 +21,15 @@ ifeq ($(strip $(UNPACK_CMD)),)
ifeq ($(filter gz tgz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
- DECOMPRESS_CMD:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) |
+ DECOMPRESS_CMD=gzip -dc $(DL_DIR)/$(PKG_SOURCE) |
endif
ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
- DECOMPRESS_CMD:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
+ DECOMPRESS_CMD=bzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
ifeq ($(filter xz txz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
- DECOMPRESS_CMD:=xzcat $(DL_DIR)/$(PKG_SOURCE) |
+ DECOMPRESS_CMD=xzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
ifeq ($(filter tgz tbz tbz2 txz,$(EXT1)),$(EXT1))
EXT:=tar
--
2.11.0
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
