From patchwork Fri Mar 17 14:50:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michal Sojka X-Patchwork-Id: 740338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vl7Zy0cvsz9ryj for ; Sat, 18 Mar 2017 01:51:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eEVUuLdD"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6EOgGMkAMZxJk66lu/ndQv9hQZdBZURwCme/JBtRhXs=; b=eEVUuLdDIw8Ym0 D1qWaKt1Nds07n2wIaliiCCFYP1Aa85WtH4zxdaOXoTWGhTw7QQT/epIub+ggUKQcd3C9P9ulXyZW Q6os55NP+jhZ7bvxktjIoAL6D0Rqny5p284+LH4m5vDoni5l2PRhbtIMtVcShec9XXRxoCvJNx/bD jIQVQKZ5Zy2R7/aNTQEyWRKFLo3Tg1c4H2SWXKM5z/DapNAqpekTLs9sBF4FfdxpkuC0aTD5816JR u7xHMZmvk/mNr82g/vCSIIIe+x1/up7ptyaePwKClICgSBNjQp9IuzzvGEiSiI4B7NBqCDz2DKguk 5Mz6eMcEmvVVF9nv+hSQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cotE4-00089L-Km; Fri, 17 Mar 2017 14:51:32 +0000 Received: from max.feld.cvut.cz ([147.32.192.36]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cotE0-000867-0W for lede-dev@lists.infradead.org; Fri, 17 Mar 2017 14:51:30 +0000 Received: from localhost (unknown [192.168.200.7]) by max.feld.cvut.cz (Postfix) with ESMTP id EE82B19F3870; Fri, 17 Mar 2017 15:51:03 +0100 (CET) X-Virus-Scanned: IMAP STYX AMAVIS Received: from max.feld.cvut.cz ([192.168.200.1]) by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new, port 10044) with ESMTP id b-OY7DIxVwCg; Fri, 17 Mar 2017 15:51:02 +0100 (CET) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by max.feld.cvut.cz (Postfix) with ESMTP id 5EDD219F4088; Fri, 17 Mar 2017 15:51:02 +0100 (CET) Received: from wsh by steelpick.2x.cz with local (Exim 4.89) (envelope-from ) id 1cotDa-0006Kh-7N; Fri, 17 Mar 2017 15:51:02 +0100 From: Michal Sojka To: lede-dev@lists.infradead.org Date: Fri, 17 Mar 2017 15:50:51 +0100 Message-Id: <20170317145051.24279-1-sojkam1@fel.cvut.cz> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170317_075128_225527_97EF6716 X-CRM114-Status: UNSURE ( 5.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [147.32.192.36 listed in list.dnswl.org] -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH] build: Fix unpacking of overlaid packages X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?= , Michal Sojka Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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 Signed-off-by: Michal Vokáč --- 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