From patchwork Tue Dec 10 21:59:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207304 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYrw1NlSz9sNH for ; Wed, 11 Dec 2019 09:00:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 30F91228B3; Tue, 10 Dec 2019 22:00:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QrP3vQawOvqt; Tue, 10 Dec 2019 22:00:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7CCF022886; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1D6FF1BF580 for ; Tue, 10 Dec 2019 22:00:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1541786397 for ; Tue, 10 Dec 2019 22:00:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1b4fZnpWnPPQ for ; Tue, 10 Dec 2019 22:00:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by whitealder.osuosl.org (Postfix) with ESMTPS id B4B768620F for ; Tue, 10 Dec 2019 22:00:00 +0000 (UTC) Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 872F1240002; Tue, 10 Dec 2019 21:59:56 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:40 +0100 Message-Id: <20191210215952.902477-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 01/12] package/pkg-utils.mk: rename extractor-dependency to extractor-system-dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The extractor-dependency macro returns which system-provided tools are needed to be able to extract the archive passed as argument. The result of this macro is added to DL_TOOLS_DEPENDENCIES so that the logic in support/dependencies/ verifies that the necessary tools are provided by the system. However, we are going to add another macro, extractor-pkg-dependency, which says which Buildroot packages are needed to extract the archive passed as argument. Indeed, for those archive types, if the extractor is not provided system-wide, we build it as a host Buildroot package. To clarify the distinction between the upcoming extractor-pkg-dependency and existing extractor-dependency, we rename the latter to extractor-system-dependency. We take this opportunity to extend the documentation of this macro. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour --- package/pkg-generic.mk | 2 +- package/pkg-utils.mk | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6d598cfd9d..5ad8f1d894 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1098,7 +1098,7 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD -DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) +DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. .PHONY: $(1) \ diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index d38971caf6..0f916d81d8 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -46,11 +46,15 @@ INFLATE.tar = cat # suitable-extractor(filename): returns extractor based on suffix suitable-extractor = $(INFLATE$(suffix $(1))) -# extractor-dependency(filename): returns extractor for 'filename' if the -# extractor is a dependency. If we build the extractor return nothing. -# $(firstword) is used here because the extractor can have arguments, like -# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'. -extractor-dependency = $(firstword $(INFLATE$(filter-out \ +# extractor-system-dependency(filename): returns the name of the tool +# needed to extract 'filename', and is meant to be used with +# DL_TOOLS_DEPENDENCIES, in order to check that the necesary tool is +# provided by the system Buildroot runs on. +# +# $(firstword) is used here because the extractor can have arguments, +# like ZCAT="gzip -d -c", and to check for the dependency we only want +# 'gzip'. +extractor-system-dependency = $(firstword $(INFLATE$(filter-out \ $(EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS),$(suffix $(1))))) # check-deprecated-variable -- throw an error on deprecated variables From patchwork Tue Dec 10 21:59:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207306 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYry6Kwxz9sPK for ; Wed, 11 Dec 2019 09:00:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D05C2228E3; Tue, 10 Dec 2019 22:00:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id shoc6mp3PwlJ; Tue, 10 Dec 2019 22:00:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6BDD6228A4; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id CA3111BF580 for ; Tue, 10 Dec 2019 22:00:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C586688427 for ; Tue, 10 Dec 2019 22:00:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oEW155DZHG4I for ; Tue, 10 Dec 2019 22:00:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by hemlock.osuosl.org (Postfix) with ESMTPS id A14728847C for ; Tue, 10 Dec 2019 22:00:00 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id AFF9F2000A; Tue, 10 Dec 2019 21:59:58 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:41 +0100 Message-Id: <20191210215952.902477-3-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 02/12] package/pkg-utils.mk: add extractor-pkg-dependency macro X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" To extract some archive types, if the extracting tool is not available on the system where Buildroot runs on, we build it using a Buildroot host package. Such dependencies are currently explicitly handled by the inner-generic-package macro, but in fact we also need to handle them in all places where the "suitable-extractor" macro is invoked, and some packages invoke it directly. Otherwise, such packages may be missing a dependency to the appropriate host Buildroot package building the extracting tool they need. An example is gettext-tiny, whose source code is a gzip-compressed tarball, but in addition manually extracts a xz-compressed tarball. This extractor-pkg-dependency macro will be used in follow-up commits to ensure all the packages that use suitable-extractor properly add the correct dependencies. Signed-off-by: Thomas Petazzoni --- package/pkg-utils.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 0f916d81d8..35a441e0aa 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -46,6 +46,14 @@ INFLATE.tar = cat # suitable-extractor(filename): returns extractor based on suffix suitable-extractor = $(INFLATE$(suffix $(1))) +EXTRACTOR_PKG_DEPENDENCY.lzma = $(BR2_XZCAT_HOST_DEPENDENCY) +EXTRACTOR_PKG_DEPENDENCY.xz = $(BR2_XZCAT_HOST_DEPENDENCY) +EXTRACTOR_PKG_DEPENDENCY.lz = $(BR2_LZIP_HOST_DEPENDENCY) + +# extractor-pkg-dependency(filename): returns a Buildroot package +# dependency needed to extract file based on suffix +extractor-pkg-dependency = $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))) + # extractor-system-dependency(filename): returns the name of the tool # needed to extract 'filename', and is meant to be used with # DL_TOOLS_DEPENDENCIES, in order to check that the necesary tool is From patchwork Tue Dec 10 21:59:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207302 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYrq3zr8z9sNH for ; Wed, 11 Dec 2019 09:00:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C323C87D31; Tue, 10 Dec 2019 22:00:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Nyl57XRgjag; Tue, 10 Dec 2019 22:00:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5735487CEC; Tue, 10 Dec 2019 22:00:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BF19A1BF580 for ; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BC4DD86C22 for ; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S37FnVoPJu4q for ; Tue, 10 Dec 2019 22:00:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A6B3586C04 for ; Tue, 10 Dec 2019 22:00:02 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id C03C3C0005; Tue, 10 Dec 2019 21:59:59 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:42 +0100 Message-Id: <20191210215952.902477-4-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 03/12] package/pkg-utils.mk: rework implementation of extractor-system-dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Now that we have the EXTRACTOR_PKG_DEPENDENCY.* variables available, we can use them to implement extractor-system-dependency: if for a given archive type, the corresponding EXTRACTOR_PKG_DEPENDENCY. variable is empty, then it means we need the corresponding extractor tool to be provided by the system. Following this, EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS is no longer used, so we can drop it from support/dependencies/. Signed-off-by: Thomas Petazzoni --- package/pkg-utils.mk | 4 ++-- support/dependencies/check-host-lzip.mk | 1 - support/dependencies/check-host-xzcat.mk | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 35a441e0aa..d324934dba 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -62,8 +62,8 @@ extractor-pkg-dependency = $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))) # $(firstword) is used here because the extractor can have arguments, # like ZCAT="gzip -d -c", and to check for the dependency we only want # 'gzip'. -extractor-system-dependency = $(firstword $(INFLATE$(filter-out \ - $(EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS),$(suffix $(1))))) +extractor-system-dependency = $(if $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))),,\ + $(firstword $(INFLATE$(suffix $(1))))) # check-deprecated-variable -- throw an error on deprecated variables # example: diff --git a/support/dependencies/check-host-lzip.mk b/support/dependencies/check-host-lzip.mk index cdd784058c..98a4f42388 100644 --- a/support/dependencies/check-host-lzip.mk +++ b/support/dependencies/check-host-lzip.mk @@ -1,5 +1,4 @@ ifeq (,$(call suitable-host-package,lzip,$(LZCAT))) BR2_LZIP_HOST_DEPENDENCY = host-lzip -EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz LZCAT = $(HOST_DIR)/bin/lzip -d -c endif diff --git a/support/dependencies/check-host-xzcat.mk b/support/dependencies/check-host-xzcat.mk index e5d72f95dd..9a78a8f38a 100644 --- a/support/dependencies/check-host-xzcat.mk +++ b/support/dependencies/check-host-xzcat.mk @@ -3,6 +3,5 @@ ifeq (,$(call suitable-host-package,xzcat,$(XZCAT))) BR2_XZCAT_HOST_DEPENDENCY = host-xz -EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma XZCAT = $(HOST_DIR)/bin/xzcat endif From patchwork Tue Dec 10 21:59:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207307 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYry5N98z9sNH for ; Wed, 11 Dec 2019 09:00:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AEC9E87D54; Tue, 10 Dec 2019 22:00:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f-od6kPrnWMh; Tue, 10 Dec 2019 22:00:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 55B0987D24; Tue, 10 Dec 2019 22:00:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 974711BF580 for ; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 926F0884D5 for ; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rfZLrWS128bb for ; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3221E8847C for ; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 1DB53240006; Tue, 10 Dec 2019 22:00:01 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:43 +0100 Message-Id: <20191210215952.902477-5-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 04/12] package/pkg-generic.mk: use extractor-pkg-dependency macro X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Instead of manually calculating the EXTRACT_DEPENDENCIES value based on the archive extension, let's use the newly introduced extractor-pkg-dependency macro. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour --- package/pkg-generic.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5ad8f1d894..45a9a133bb 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -644,15 +644,7 @@ $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY) endif ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) -ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),) -$(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY) -endif -endif - -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) -ifneq ($$(filter .lz,$$(suffix $$($(2)_SOURCE))),) -$(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) -endif +$(2)_EXTRACT_DEPENDENCIES += $$(call extractor-pkg-dependency,$$($(2)_SOURCE)) endif ifeq ($$(BR2_CCACHE),y) From patchwork Tue Dec 10 21:59:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207305 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYry0SKNz9sPJ for ; Wed, 11 Dec 2019 09:00:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D33E886C20; Tue, 10 Dec 2019 22:00:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0vwsYVvQcLSB; Tue, 10 Dec 2019 22:00:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A385D86C26; Tue, 10 Dec 2019 22:00:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B1C351BF995 for ; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AE0C48847C for ; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2Mf8hILHzZNU for ; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by hemlock.osuosl.org (Postfix) with ESMTPS id 229AB88427 for ; Tue, 10 Dec 2019 22:00:03 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 651F2C0007; Tue, 10 Dec 2019 22:00:02 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:44 +0100 Message-Id: <20191210215952.902477-6-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 05/12] arch/arch.mk.xtensa: fix usage of arch-xtensa-overlay-extract X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" arch-xtensa-overlay-extract was used in gcc, linux, uboot, binutils and gdb without properly accouting for the package dependencies that may be needed to extract the overlay tarball. This commit fixes that by introducing an ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES variable in arch.mk.xtensa, and then use it where appropriate in gcc, linux, uboot, binutils and gdb. Signed-off-by: Thomas Petazzoni Reviewed-by: Max Filippov --- Note: if this is preferred, we could avoid adding the ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES variable, and directly call extractor-pkg-dependency from each of gcc, linux, uboot, binutils and gdb. Having an intermediate variable felt a bit simpler/cleaner, but I wouldn't mind changing it. --- arch/arch.mk.xtensa | 2 ++ boot/uboot/uboot.mk | 1 + linux/linux.mk | 1 + package/binutils/binutils.mk | 2 ++ package/gcc/gcc-final/gcc-final.mk | 1 + package/gcc/gcc-initial/gcc-initial.mk | 1 + package/gdb/gdb.mk | 2 ++ 7 files changed, 10 insertions(+) diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index fd410f6bfa..c0f83c27d2 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -19,6 +19,8 @@ else ARCH_XTENSA_OVERLAY_FILE = $(BR_ARCH_XTENSA_OVERLAY_FILE) endif +ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(ARCH_XTENSA_OVERLAY_FILE)) + ################################################################################ # arch-xtensa-overlay-extract -- extract an extensa overlay # diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0ebda6588c..eaf8d4a30a 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -185,6 +185,7 @@ ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) define UBOOT_XTENSA_OVERLAY_EXTRACT $(call arch-xtensa-overlay-extract,$(@D),u-boot) endef +UBOOT_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) UBOOT_POST_EXTRACT_HOOKS += UBOOT_XTENSA_OVERLAY_EXTRACT UBOOT_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif diff --git a/linux/linux.mk b/linux/linux.mk index 762f8868b1..325a15f74c 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -120,6 +120,7 @@ ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) define LINUX_XTENSA_OVERLAY_EXTRACT $(call arch-xtensa-overlay-extract,$(@D),linux) endef +LINUX_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) LINUX_POST_EXTRACT_HOOKS += LINUX_XTENSA_OVERLAY_EXTRACT LINUX_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index a19d6940f7..0af83e92d0 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -120,8 +120,10 @@ ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) define BINUTILS_XTENSA_OVERLAY_EXTRACT $(call arch-xtensa-overlay-extract,$(@D),binutils) endef +BINUTILS_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) +HOST_BINUTILS_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) HOST_BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT HOST_BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 24d034b720..57a7e6d8a2 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -17,6 +17,7 @@ HOST_GCC_FINAL_DEPENDENCIES = \ HOST_GCC_FINAL_EXCLUDES = $(HOST_GCC_EXCLUDES) ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) +HOST_GCC_FINAL_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT HOST_GCC_FINAL_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index f5bc6c5b77..36460d3712 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -18,6 +18,7 @@ HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES) HOST_GCC_INITIAL_EXCLUDES = $(HOST_GCC_EXCLUDES) ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) +HOST_GCC_INITIAL_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT HOST_GCC_INITIAL_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 46d745a897..b1bfca1535 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -48,8 +48,10 @@ ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) define GDB_XTENSA_OVERLAY_EXTRACT $(call arch-xtensa-overlay-extract,$(@D),gdb) endef +GDB_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) GDB_POST_EXTRACT_HOOKS += GDB_XTENSA_OVERLAY_EXTRACT GDB_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) +HOST_GDB_EXTRACT_DEPENDENCIES += $(ARCH_XTENSA_OVERLAY_EXTRACT_DEPENDENCIES) HOST_GDB_POST_EXTRACT_HOOKS += GDB_XTENSA_OVERLAY_EXTRACT HOST_GDB_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif From patchwork Tue Dec 10 21:59:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207303 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYrt0Chbz9sNH for ; Wed, 11 Dec 2019 09:00:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DB83686C2B; Tue, 10 Dec 2019 22:00:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m4a7Q3BlK8Iw; Tue, 10 Dec 2019 22:00:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 73B6686C24; Tue, 10 Dec 2019 22:00:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 95ED31BF580 for ; Tue, 10 Dec 2019 22:00:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 929188847C for ; Tue, 10 Dec 2019 22:00:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K7MwC1jUZd3w for ; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 51C45884A2 for ; Tue, 10 Dec 2019 22:00:05 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id AD336240002; Tue, 10 Dec 2019 22:00:03 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:45 +0100 Message-Id: <20191210215952.902477-7-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 06/12] package/android-tools: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" android-tools uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Signed-off-by: Thomas Petazzoni --- package/android-tools/android-tools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/android-tools/android-tools.mk b/package/android-tools/android-tools.mk index 3d5c76a322..fda58e13bb 100644 --- a/package/android-tools/android-tools.mk +++ b/package/android-tools/android-tools.mk @@ -22,7 +22,9 @@ define ANDROID_TOOLS_DEBIAN_EXTRACT endef HOST_ANDROID_TOOLS_POST_EXTRACT_HOOKS += ANDROID_TOOLS_DEBIAN_EXTRACT +HOST_ANDROID_TOOLS_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(ANDROID_TOOLS_EXTRA_DOWNLOADS)) ANDROID_TOOLS_POST_EXTRACT_HOOKS += ANDROID_TOOLS_DEBIAN_EXTRACT +ANDROID_TOOLS_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(ANDROID_TOOLS_EXTRA_DOWNLOADS)) # Apply the Debian patches before applying the Buildroot patches define ANDROID_TOOLS_DEBIAN_PATCH From patchwork Tue Dec 10 21:59:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207309 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYs06pLjz9sPJ for ; Wed, 11 Dec 2019 09:00:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3244E87CEC; Tue, 10 Dec 2019 22:00:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HETGaaN9KAXy; Tue, 10 Dec 2019 22:00:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6ADD287D42; Tue, 10 Dec 2019 22:00:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2931A1BF580 for ; Tue, 10 Dec 2019 22:00:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 26AB186C18 for ; Tue, 10 Dec 2019 22:00:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e9XP-ntpqmBl for ; Tue, 10 Dec 2019 22:00:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1CC4B86C22 for ; Tue, 10 Dec 2019 22:00:08 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id B73B6E000A; Tue, 10 Dec 2019 22:00:04 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:46 +0100 Message-Id: <20191210215952.902477-8-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 07/12] package/cargo: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" cargo uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Signed-off-by: Thomas Petazzoni --- package/cargo/cargo.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk index a387281b4c..adb7bc282e 100644 --- a/package/cargo/cargo.mk +++ b/package/cargo/cargo.mk @@ -42,6 +42,7 @@ define HOST_CARGO_EXTRACT_DEPS endef HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS +HOST_CARGO_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(CARGO_DEPS_SOURCE)) define HOST_CARGO_EXTRACT_INSTALLER @mkdir -p $(@D)/src/rust-installer @@ -51,6 +52,7 @@ define HOST_CARGO_EXTRACT_INSTALLER endef HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER +HOST_CARGO_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(CARGO_INSTALLER_SOURCE)) define HOST_CARGO_SETUP_DEPS mkdir -p $(@D)/.cargo From patchwork Tue Dec 10 21:59:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207311 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.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 47XYs31gtxz9sPJ for ; Wed, 11 Dec 2019 09:00:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E07A5884A2; Tue, 10 Dec 2019 22:00:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qy4lYpvutOIh; Tue, 10 Dec 2019 22:00:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D4C0884B9; Tue, 10 Dec 2019 22:00:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5EC631BF580 for ; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5040087D24 for ; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VV302aq-LXEO for ; Tue, 10 Dec 2019 22:00:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by whitealder.osuosl.org (Postfix) with ESMTPS id BCAF587D13 for ; Tue, 10 Dec 2019 22:00:10 +0000 (UTC) Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 52CAC200006; Tue, 10 Dec 2019 22:00:07 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:47 +0100 Message-Id: <20191210215952.902477-9-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 08/12] package/gettext-tiny: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vadim Kochan , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" gettext-tiny uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Fixes: http://autobuild.buildroot.net/results/83c6d47c06334bef27791a59bdd491b1de124c49/ Signed-off-by: Thomas Petazzoni --- package/gettext-tiny/gettext-tiny.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index 6ee6269e09..403f974b9d 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -39,6 +39,7 @@ define HOST_GETTEXT_TINY_EXTRACT_GNU_GETTEXT $(TAR) --strip-components=1 -C $(@D)/gettext-gnu $(TAR_OPTIONS) - endef HOST_GETTEXT_TINY_POST_EXTRACT_HOOKS += HOST_GETTEXT_TINY_EXTRACT_GNU_GETTEXT +HOST_GETTEXT_TINY_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(GETTEXT_GNU_SOURCE)) define HOST_GETTEXT_TINY_COPY_EXTRA_FILES $(foreach f,$(GETTEXT_TINY_EXTRA_GETTEXT_FILES),\ From patchwork Tue Dec 10 21:59:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207310 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYs15kyPz9sNH for ; Wed, 11 Dec 2019 09:00:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4635786C3E; Tue, 10 Dec 2019 22:00:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aP-C7VaXAIKh; Tue, 10 Dec 2019 22:00:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BB12386C29; Tue, 10 Dec 2019 22:00:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CE2E91BF580 for ; Tue, 10 Dec 2019 22:00:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CBB4A86C22 for ; Tue, 10 Dec 2019 22:00:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eZg5LOmB8ceF for ; Tue, 10 Dec 2019 22:00:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8319686C25 for ; Tue, 10 Dec 2019 22:00:11 +0000 (UTC) Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 1EEA0240005; Tue, 10 Dec 2019 22:00:08 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:48 +0100 Message-Id: <20191210215952.902477-10-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 09/12] package/murata-cyw-fw: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcin Niestroj , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" murata-cyw-fw uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Signed-off-by: Thomas Petazzoni --- package/murata-cyw-fw/murata-cyw-fw.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/murata-cyw-fw/murata-cyw-fw.mk b/package/murata-cyw-fw/murata-cyw-fw.mk index b99168b875..ea4f3fcc34 100644 --- a/package/murata-cyw-fw/murata-cyw-fw.mk +++ b/package/murata-cyw-fw/murata-cyw-fw.mk @@ -22,6 +22,9 @@ define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH ) endef MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH +MURATA_CYW_FW_EXTRACT_DEPENDENCIES += \ + $(foreach tar,$(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)),\ + $(call extractor-pkg-dependency,$(tar))) MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \ brcmfmac43012-sdio.bin \ From patchwork Tue Dec 10 21:59:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207308 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.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 47XYrz2md0z9sPJ for ; Wed, 11 Dec 2019 09:00:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3BF5B88427; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uEfhrBsCTpcy; Tue, 10 Dec 2019 22:00:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B6C4C8847C; Tue, 10 Dec 2019 22:00:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 32B2E1BF580 for ; Tue, 10 Dec 2019 22:00:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2FFF386C1D for ; Tue, 10 Dec 2019 22:00:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDomyHFITIIL for ; Tue, 10 Dec 2019 22:00:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D6E9F86C29 for ; Tue, 10 Dec 2019 22:00:12 +0000 (UTC) Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay12.mail.gandi.net (Postfix) with ESMTPSA id AD9D4200002; Tue, 10 Dec 2019 22:00:10 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:49 +0100 Message-Id: <20191210215952.902477-11-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 10/12] package/nvidia-tegra23/nvidia-tegra32-binaries: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" nvidia-tegra23-binaries uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Signed-off-by: Thomas Petazzoni --- .../nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk index 9b153b0250..1785856847 100644 --- a/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk +++ b/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk @@ -44,6 +44,7 @@ define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nv_sample_apps/nvgstapps/ $(TAR_OPTIONS) - endef NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER +NVIDIA_TEGRA23_BINARIES_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,nvidia_drivers.tbz2) define NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS mkdir -p $(1)/usr/lib From patchwork Tue Dec 10 21:59:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207312 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYs60tmXz9sNH for ; Wed, 11 Dec 2019 09:00:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC1D586C29; Tue, 10 Dec 2019 22:00:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BtjUNdG6UaTM; Tue, 10 Dec 2019 22:00:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7F44A86C37; Tue, 10 Dec 2019 22:00:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F29111BF580 for ; Tue, 10 Dec 2019 22:00:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D87DC87D51 for ; Tue, 10 Dec 2019 22:00:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YLambJcFWFVi for ; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by whitealder.osuosl.org (Postfix) with ESMTPS id DAA9C86397 for ; Tue, 10 Dec 2019 22:00:13 +0000 (UTC) Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 35C81240002; Tue, 10 Dec 2019 22:00:12 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:50 +0100 Message-Id: <20191210215952.902477-12-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 11/12] package/perl: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" perl uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Signed-off-by: Thomas Petazzoni --- package/perl/perl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 0ab81ddb34..3b8b9fb0c4 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -27,6 +27,7 @@ define PERL_CROSS_EXTRACT $(call suitable-extractor,$(PERL_CROSS_SOURCE)) $(PERL_DL_DIR)/$(PERL_CROSS_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - endef +PERL_EXTRACT_DEPENDENCIES += $(call extractor-pkg-dependency,$(PERL_CROSS_SOURCE)) PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT # Even though perl is not an autotools-package, it uses config.sub and From patchwork Tue Dec 10 21:59:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1207313 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47XYs74NQnz9sNH for ; Wed, 11 Dec 2019 09:00:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CDBC187D6D; Tue, 10 Dec 2019 22:00:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LLV9bB136ufc; Tue, 10 Dec 2019 22:00:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A23B87D5D; Tue, 10 Dec 2019 22:00:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C65F01BF580 for ; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C1F7D86C29 for ; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W-5uiDREnMEE for ; Tue, 10 Dec 2019 22:00:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 42CF286C18 for ; Tue, 10 Dec 2019 22:00:15 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (amarseille-658-1-11-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 492C720007; Tue, 10 Dec 2019 22:00:13 +0000 (UTC) From: Thomas Petazzoni To: "Yann E. MORIN" , "Arnout Vandecappelle (Essensium/Mind)" , Buildroot List Date: Tue, 10 Dec 2019 22:59:51 +0100 Message-Id: <20191210215952.902477-13-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> References: <20191210215952.902477-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 12/12] package/rust-bin: add missing extract dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" rust-bin uses suitable-extractor to manually extract a tarball, so it should have the appropriate package dependencies added to _EXTRACT_DEPENDENCIES. Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index a374215e20..526c45a45e 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -32,7 +32,9 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \ ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . endef - +HOST_RUST_BIN_EXTRACT_DEPENDENCIES += \ + $(foreach f,$(HOST_RUST_BIN_EXTRA_DOWNLOADS),\ + $(call extractor-pkg-dependency,$(f))) HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT HOST_RUST_BIN_INSTALL_OPTS = \