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)