From patchwork Mon Apr 15 19:47:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085881 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NXEfUexF"; dkim-atps=neutral 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 44jfDJ5ccdz9s0W for ; Tue, 16 Apr 2019 05:47:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2DAFA214EB; Mon, 15 Apr 2019 19:47:42 +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 VUtrfQTxNFa1; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 19C0C2153B; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2115E1BF37A for ; Mon, 15 Apr 2019 19:47:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C0B4214EB for ; Mon, 15 Apr 2019 19:47:39 +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 S+DBQzCBSAf7 for ; Mon, 15 Apr 2019 19:47:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by silver.osuosl.org (Postfix) with ESMTPS id 6716E1FEE0 for ; Mon, 15 Apr 2019 19:47:38 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id t17so23463516wrw.13 for ; Mon, 15 Apr 2019 12:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rhYm/LvMvKAkuqKDyEPWh3UcAOb+mYEAmipUmBBZdS4=; b=NXEfUexFthWTWWTkRIXQajrUwOEZMSwnqKX2ahZ/5rHmq1IGeSh+HSxFjUTov78mw/ La5RCuUavLx+mjvZVVZSARBQvtBgg8mKQPLUgOvkouOirX/k3zx3yIHLUEfmBDhIYn3y rMZ8qPqCfyP5nOw9XBQ+XhIo1bf+mbEXmQW977P4V1wukN/GMAAbYUyMgI1wmbeZbv/1 dlID4/wOFiHQPZaS4jk5gdAG+BnPHnsYmMw2I1pTCn9kYcDNOSBwftqPfaqtmWyYjh6z gEmOv3BOgmcU8CygyRHQIYUpIGcMkZpn7oyy0yp8Y2IgbzpQRQLMq2Rgn7h92ta+k+FF BG1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=rhYm/LvMvKAkuqKDyEPWh3UcAOb+mYEAmipUmBBZdS4=; b=CswZd73y7q3iyZei6J/zgY0c2tz69GT1tPwen/ZEezckjynw1FbhNjFsAcylo3lSb1 B0o2iCP+W9zZLDhC8gPAyV8aKpWg6zyMKTzITMtFk/ruaB2KkJXTKnUPEFR//d8m5mXj lOqpKGlKdk+5nhsO6YEDopQg37fmwqNcGnSglB44lCJxZ/gO+FY2YlMKd8LicwBZlZwX kLkZxIkyc6OkafZz4MBQQolNs+CHVOCPXQ1jtHL30vDYhG+6eccNhPrzDj7NNVVG/3vH VrpWaIzJ0bug3DcIqIftnEPlL62ntrnca4ac3SJRjpVtuWvAXZC3Ct079bkQuJBzgIfQ aRDg== X-Gm-Message-State: APjAAAXrP7ADXDuTmDroY8vjYPCzyw6zoLnX/S/Z7Cz5vv7P0t+a0uqm nUvVu3tdIkkxZfl/nMj2LtgNueH8 X-Google-Smtp-Source: APXvYqzHR3Z3Tc8WXdHletk6VrB2dBzo8N5pT6zevxdtmGmR1/mkW5wOkP1hdjIUtZP80SnN4dj8TQ== X-Received: by 2002:adf:edc6:: with SMTP id v6mr44050865wro.189.1555357656688; Mon, 15 Apr 2019 12:47:36 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:36 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:23 +0200 Message-Id: <2198092456f378175cf10e42002887e3c121abb3.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 01/12 v3] infra/pkg-download: return just a list of URIs 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, the internal DOWNLOAD_URIS variable is set to be a list of options to pass to the download wrapper, with each URI passed as '-u URI'. This precludes using that variable to get just the list of URIs, in case we need to do something else with it. Fix the variable to really only contain the list of URIs. Adapt the caller accordingly. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Changes v1 -> v2: - use foreach instead of patsubst (Thomas) --- package/pkg-download.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 7cd87c38ff..4163333998 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -75,17 +75,17 @@ export BR_NO_CHECK_HASH_FOR = ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) DOWNLOAD_URIS += \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) + $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ + $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) endif ifeq ($(BR2_PRIMARY_SITE_ONLY),) DOWNLOAD_URIS += \ - -u $(patsubst %/,%,$(dir $(call qstrip,$(1)))) + $(patsubst %/,%,$(dir $(call qstrip,$(1)))) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) DOWNLOAD_URIS += \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) + $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ + $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) endif endif @@ -101,7 +101,7 @@ define DOWNLOAD -N '$($(PKG)_RAWNAME)' \ -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ $(if $($(PKG)_GIT_SUBMODULES),-r) \ - $(DOWNLOAD_URIS) \ + $(foreach uri,$(DOWNLOAD_URIS),-u $(uri)) \ $(QUIET) \ -- \ $($(PKG)_DL_OPTS) From patchwork Mon Apr 15 19:47:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085882 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gtikcE9o"; dkim-atps=neutral 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 44jfDM0FKFz9s0W for ; Tue, 16 Apr 2019 05:47:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0821C863A6; Mon, 15 Apr 2019 19:47:44 +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 FTq8SBkbLRHE; Mon, 15 Apr 2019 19:47:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C981C86614; Mon, 15 Apr 2019 19:47:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A1C651BF37A for ; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9D1B622802 for ; Mon, 15 Apr 2019 19:47:40 +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 z5SpcaevBx34 for ; Mon, 15 Apr 2019 19:47:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by silver.osuosl.org (Postfix) with ESMTPS id 5290B1FEE0 for ; Mon, 15 Apr 2019 19:47:39 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id k11so23536709wro.5 for ; Mon, 15 Apr 2019 12:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=d+2NWCDo15wldlErAcVfLETMTJeQXQTthFo2O0bYZJU=; b=gtikcE9oSjp6WAJodJi8r2947wJyAZ/0d5c2I2Mc9aMHimau4+NSt1evFLEfMjoZat nR+yUwNCPfrXC7FxqN2DzUS11MSGEQsCM8zNm+QVgS/HXGI3de8wIxAWNodiCS0oRygo EyZDwNtLWmGWA9Afb5qkE7f+LUYjuabiQMjPgUKw6BYW7TG3XpKvot0pm7ZHzCIKR3N8 9hBzt4MsomwegTSFNyGD2UPruMmCYOpB3w53xbigxd1gstBJbhmA5pZdoXwB/aOeqOXk r5/l9gyqRgcw40MOycdSIef9+yMKEcENMnu7dnfNOjW1kWleRa9NKS7XZPpMT2pJeMRX CHFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=d+2NWCDo15wldlErAcVfLETMTJeQXQTthFo2O0bYZJU=; b=frcqPYmxmm1xDxqe9FiPSVbqZKf5KawOVjNdTwhyqIcF9Qi6QBTCW3VQ0w8qTtJTDq Mamxj1rWWF7oelo850qvGfzSIDti533e7NqgY/fdAC4NY52h4PO8n1WsyKITO/4naJFb acEZyFmBOR3eQEJ9oG7AG3cuGjva/t6ykfhlhB+r4mb1AM8XLaIpUYuBRcpH2O1O36bQ mgaDbA+M9288Qr4mqq28N1y+qW0UM6QFJILq1jMxEzuZxoRsZ4ykatw1/AsxlVf7o+v0 Uk31xJ0joD5Etc7o5o8IuFFHvqLnJnm6Pl9fJqM451O3obBDyfa5uVpmAEfBhXQSSm3u oLbA== X-Gm-Message-State: APjAAAUclJn2/pK4efZYLmRYigT08++LxWvW9Bcs2wslTH6kmJOExFoU W8Lmm62aEp4h2o/AxKg1wnwKSQvo X-Google-Smtp-Source: APXvYqzUDIFU4m6JqBK2YMok9TDzrPuNw4QlzQLWxI+OkPLoymL+h1nHwkqzJm8z5B/Lp/z389TkBg== X-Received: by 2002:adf:fd46:: with SMTP id h6mr50616011wrs.139.1555357657736; Mon, 15 Apr 2019 12:47:37 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:37 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:24 +0200 Message-Id: <493aca4729625cdaa2db75df867863f79cf9833b.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 02/12 v3] infra/pkg-download: make the URI list a callable 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, that variable is context-dependent, as it expects the PKG variable to exist and be defined to the current package. This is not so clean, so change the variable to a callable macro. Adapt the caller accordingly. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Changes v1 -> v2: - split DOWNLOAD/DOWNLOAD_URIS comment (Thomas DS) --- package/pkg-download.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 4163333998..623caf9325 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -63,19 +63,19 @@ github = https://github.com/$(1)/$(2)/archive/$(3) export BR_NO_CHECK_HASH_FOR = ################################################################################ -# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download -# source from: +# DOWNLOAD_URIS - List the candidates URIs where to get the package from: # 1) BR2_PRIMARY_SITE if enabled # 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set # 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set # # Argument 1 is the source location +# Argument 2 is the upper-case package name # ################################################################################ ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) DOWNLOAD_URIS += \ - $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ + $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(2)_DL_SUBDIR)),urlencode) \ $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) endif @@ -84,11 +84,19 @@ DOWNLOAD_URIS += \ $(patsubst %/,%,$(dir $(call qstrip,$(1)))) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) DOWNLOAD_URIS += \ - $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ + $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(2)_DL_SUBDIR)),urlencode) \ $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) endif endif +################################################################################ +# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download +# source from the list returned by DOWNLOAD_URIS. +# +# Argument 1 is the source location +# +################################################################################ + define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ @@ -101,7 +109,7 @@ define DOWNLOAD -N '$($(PKG)_RAWNAME)' \ -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ $(if $($(PKG)_GIT_SUBMODULES),-r) \ - $(foreach uri,$(DOWNLOAD_URIS),-u $(uri)) \ + $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(PKG)),-u $(uri)) \ $(QUIET) \ -- \ $($(PKG)_DL_OPTS) From patchwork Mon Apr 15 19:47:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085883 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c8z+oNjl"; dkim-atps=neutral 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 44jfDQ3QB4z9s3q for ; Tue, 16 Apr 2019 05:47:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 795338682F; Mon, 15 Apr 2019 19:47:48 +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 puycr5p-TmSq; Mon, 15 Apr 2019 19:47:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A926B86651; Mon, 15 Apr 2019 19:47:44 +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 60DE41BF37A for ; Mon, 15 Apr 2019 19:47:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5DD39824D4 for ; Mon, 15 Apr 2019 19:47:41 +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 AuK14c5LI-ta for ; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by hemlock.osuosl.org (Postfix) with ESMTPS id A710F81FB4 for ; Mon, 15 Apr 2019 19:47:40 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id h18so21973487wml.1 for ; Mon, 15 Apr 2019 12:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+AuGiLL0gV5Quod97sZiq1ZC+LbZ5rtQvOViF3qWlfY=; b=c8z+oNjlqm2pmp4/WMRVTfS6tM08rcN2t7AQlYVW4Vg+50GQxSQmQxFoB6YK8eITKx reBg73dT2C4vf1Km1tLI9weB6Dqi1pI77msZDGTa9IJNElsxJVfCTMtUxHzlpHbtiQZO qAiohZUyxJsuQASgWVzf9G80wfxWqjDehSP3M72Rr1vzxAvhmi13uCQgt0pOXG2kZm4C a48PEmi/pBZuIQam+WEegEfYBaBX5YhkkgE+zjTXj+zYkdc8qeXc4wSo1xkZTNosbIL0 prMPWMKNEd08FHpetzkBIttzMXaM9DXHP0lUzDqomFeY3P54dfHMHOsUTnM7AUVqzxzW Alxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+AuGiLL0gV5Quod97sZiq1ZC+LbZ5rtQvOViF3qWlfY=; b=rP1L/qMYjRkSIxii2BVOMLnV9IrhUlct5PNWD9d2O0SwbWbNV46xYNzYBQuUgo6ZD0 6yMA45wVti0ZDvjijcVryrBb83LMIjQIaun4fBjBGmpS2iCxg4L5PBKeUCkZVFWkGfv+ 5+rUPTVirmIObPUiLNlNla3PeH7kMrE2h6uscooTSVI3JEdINtb0a1DWkYhQ1qffP2PW IhtocddJ9AZYIPvJ1fL39xTDetWEo32XeosLFqCDVRjr427Q6YDcVZD+qMUTodLQgWlW WqPIAAtQCpXxdXCiSsqeH8bDmRlKSS80PLbhbni4VhAjfSYdZuLyBHvqbNilQVr3n+qK LvMw== X-Gm-Message-State: APjAAAW/8xp1Sd8sIthx6uhgMRBKGXeSQdFepglyRT1+zAF+FyG8RIzA xTq8+8Keu6XnbGUTWhuz8kOijFqz X-Google-Smtp-Source: APXvYqyyPnOW6H342P7OuFoNYiEnYu0Lm1Je6Kugr2uCA5WpDQ4IX4hnVZUpYn1BSTz+pmrNC+sJ9w== X-Received: by 2002:a1c:c101:: with SMTP id r1mr24496294wmf.123.1555357658902; Mon, 15 Apr 2019 12:47:38 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:38 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:25 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 03/12 v3] infra/pkg-download: get rid of the FLOCK variable 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni , Maxime Hadjinlian MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The FLOCK variable is context-dependent, and expects the PKG variable to be set to the current package. This is not so nice. Besides, it is used in a single location. Get rid of this intermediate variable, and directly use flock where we need it. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Maxime Hadjinlian --- package/pkg-download.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 623caf9325..96a12b1f2e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -18,7 +18,6 @@ export SCP := $(call qstrip,$(BR2_SCP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) DL_WRAPPER = support/download/dl-wrapper -FLOCK = flock $($(PKG)_DL_DIR)/ # DL_DIR may have been set already from the environment ifeq ($(origin DL_DIR),undefined) @@ -99,7 +98,7 @@ endif define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) - $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ + $(Q)$(EXTRA_ENV) flock $($(PKG)_DL_DIR)/ $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -d '$($(PKG)_DL_DIR)' \ -D '$(DL_DIR)' \ From patchwork Mon Apr 15 19:47:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085884 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qdjS4o9u"; dkim-atps=neutral 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 44jfDR3bS4z9s4V for ; Tue, 16 Apr 2019 05:47:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3330D857F8; Mon, 15 Apr 2019 19:47:48 +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 muTxixkguHZR; Mon, 15 Apr 2019 19:47:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3FFE854C9; Mon, 15 Apr 2019 19:47:46 +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 B523A1BF37A for ; Mon, 15 Apr 2019 19:47:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B25D6854C9 for ; Mon, 15 Apr 2019 19:47:42 +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 R0TL-TIsex4g for ; Mon, 15 Apr 2019 19:47:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id ED757850EA for ; Mon, 15 Apr 2019 19:47:41 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id z24so22105874wmi.5 for ; Mon, 15 Apr 2019 12:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3rFKwkTen1H9FXqxLIBM0pt4HzD5OPjTcuZWA+1/Jhk=; b=qdjS4o9uV/Nt80NZbdqEwEbdO2uSkmeuliSR4qtE+vFIZwRjSFsktxtwYkRB1sb6q6 s1DdDEPkDawDNVqGakZUD2QbwkI7+6SsWDqZZJnK3tnDxxT4N/ohnLNdcTaIQNnKddCn l7RWeVg7jNY/pEaj95U8AxDjAEogdS0x94i4zr8QPvmHoTTwqAFq95eyX8gbDac/0T2i TkW/6VvxjRxrkUCH/CFZfznw3YDDh6Oic9dYnEf7EImk+AHkxY4GAWmQ7H9yCWSKy/XS d/ZHo9P8q9i7y3bt0nx44sa30xNZ7zTMAVXaUkqasQdg7ifNnLFo92X7u/bWrMaIArKW Hvig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3rFKwkTen1H9FXqxLIBM0pt4HzD5OPjTcuZWA+1/Jhk=; b=oy87VGRQMw955qc7XnWxvOGJ2PMBzvk8it+4Ad9dbUbgRcilVePLO+X871P5z9PMOK BQSNP7rKeVThC3AFFmIOfszVUR9aBgkscmmvbN7WEhVdOLb3v/eDiATjyqDzvtQYFRGO V6TfryDvkiJsosjI4g58eyN0WT/3LfnowG/etAP53sfAH/HV0+1nKlRWD4Mx1/3FqyvD mZdNrA9NBgb0bbrxaqUQV8GWYW4WiX6IPpyIZ3R45bDmdsJw1UcPrUYEqg1WnYykcCpM U+jGjYKtp+MLbMN75ip9ydH3ykI7Zrs7Ry0Kf9L1xR2sByqSIOOmt/PsX6DiygkwUtcp F3DA== X-Gm-Message-State: APjAAAW8pFMYvTsbJ60CdXoOXzN06/MGphCefu4CMBmb5Dd8bORfShCL xyiFAYvyG0Zgs4zQWQbN4xZjNuy0 X-Google-Smtp-Source: APXvYqwi3slYqXO28PhFOxAZPpsKpTnXqSn7qCnS6+7tR2R5UCkMLGoLP751YNtgNvEexO25C8H0Wg== X-Received: by 2002:a1c:1aca:: with SMTP id a193mr24785229wma.40.1555357660207; Mon, 15 Apr 2019 12:47:40 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:39 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:26 +0200 Message-Id: <2fe2e7fa9509df01908569ac95627f8fa7494e58.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 04/12 v3] infra/pkg-download: make the DOWNLOAD macro fully parameterised 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, the DOWNLOAD macro is context-dependent and expects the PKG variable to be set to the current package. This is not so nice. Change the macro to expect the upper-case package name as a parameter, rather than expect it from a variable. Adapt the caller accordingly. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- changes v1 -> v2: - DOWNLOAD_URIS was called twice in v1, once with $(PKG) and once with $(1) (due to an incorrect rebase) --- package/pkg-download.mk | 23 ++++++++++++----------- package/pkg-generic.mk | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 96a12b1f2e..de619ba90a 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -93,23 +93,24 @@ endif # source from the list returned by DOWNLOAD_URIS. # # Argument 1 is the source location +# Argument 2 is the upper-case package name # ################################################################################ define DOWNLOAD - $(Q)mkdir -p $($(PKG)_DL_DIR) - $(Q)$(EXTRA_ENV) flock $($(PKG)_DL_DIR)/ $(DL_WRAPPER) \ - -c '$($(PKG)_DL_VERSION)' \ - -d '$($(PKG)_DL_DIR)' \ + $(Q)mkdir -p $($(2)_DL_DIR) + $(Q)$(EXTRA_ENV) flock $($(2)_DL_DIR)/ $(DL_WRAPPER) \ + -c '$($(2)_DL_VERSION)' \ + -d '$($(2)_DL_DIR)' \ -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ - -H '$($(PKG)_HASH_FILE)' \ - -n '$($(PKG)_BASENAME_RAW)' \ - -N '$($(PKG)_RAWNAME)' \ - -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ - $(if $($(PKG)_GIT_SUBMODULES),-r) \ - $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(PKG)),-u $(uri)) \ + -H '$($(2)_HASH_FILE)' \ + -n '$($(2)_BASENAME_RAW)' \ + -N '$($(2)_RAWNAME)' \ + -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_GIT_SUBMODULES),-r) \ + $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ $(QUIET) \ -- \ - $($(PKG)_DL_OPTS) + $($(2)_DL_OPTS) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a83813e28d..8ff8cff12d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -149,7 +149,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: break ; \ fi ; \ done - $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) + $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p),$(PKG))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) @$(call step_end,download) @@ -158,7 +158,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: # Retrieve actual source archive, e.g. for prebuilt external toolchains $(BUILD_DIR)/%/.stamp_actual_downloaded: @$(call step_start,actual-download) - $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)) + $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL),$(PKG)) $(Q)mkdir -p $(@D) @$(call step_end,actual-download) $(Q)touch $@ From patchwork Mon Apr 15 19:47:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085886 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nqtHxQkk"; dkim-atps=neutral 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 44jfDV380zz9s4V for ; Tue, 16 Apr 2019 05:47:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D30831FEE0; Mon, 15 Apr 2019 19:47:52 +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 7X-3srin0DfJ; Mon, 15 Apr 2019 19:47:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E31C121FAC; Mon, 15 Apr 2019 19:47:48 +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 74AA41BF37A for ; Mon, 15 Apr 2019 19:47:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6490386797 for ; Mon, 15 Apr 2019 19:47:45 +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 kieSjOgNrHiY for ; Mon, 15 Apr 2019 19:47:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 69A4C85540 for ; Mon, 15 Apr 2019 19:47:43 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id g3so23483488wrx.9 for ; Mon, 15 Apr 2019 12:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=S6p0iXj1HKUPiBS3ksTkojx2OSgldDb/PDvvWszrWuc=; b=nqtHxQkksISZIIigOQscnmoHjBBk+MkqjFdUOil7CBS5lzIiQQtaYzdsHgofBNuQfL 5PVHqaVNmnKsyz9aCnOgAFgQJeyC/dMXJ2aZG1DtqsT7KF8tPJcCHGl0xGSudotSX6AE BqzWb2726BW5mhK535aVG9SX8pw4p5YCmKm+yBQhc4G2NML0gxil/tbuYS4uIIro9gpL DdlmyeaGsP372b0i+YzhmCNKk0FqiRJISqdxXEB5a6js5gWW/FxLD1Oq7rp6dzL81ZrN srSHc5yNUebqIZZN9qFSyMWV5RFRHt1trSjV9nOpm4+W/Kaa57jFo5bMgShhbbFFZT03 wMMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=S6p0iXj1HKUPiBS3ksTkojx2OSgldDb/PDvvWszrWuc=; b=GO1M7PNDenOx2lO6w2aSFkb/zYe1K/SHjbCg+CrPrBebP4CA8j/LC4Mlvn884QzwOR 93kiHtpudnwtZ9KoPuYtHhLXDbvDCMvlpHHdrRoXiRI9UVDskX9b9r0wYO6+tux1/iTq AQ+QDq9J/kQ6XwNYzureoirh+yQJud761rrEjidzmc6TNCoD4Z+4u437CeiD6V8befJM Ul5IVTyc0jQvPm5nzlN2aY728lde416IZto5+55tBKgJE126u5ZKDoFmC9VqwqiXRaeY WLL0hQKIkEqrQbEaqVzICjCDcUnjCl+cKHbFJKjgpTcyWVSSuuOqmtheUFoMDOU5a8mp Tn/w== X-Gm-Message-State: APjAAAXwCwzjTmL5W7zuhlmGWK8KRz3iepNzMW8kYr67N7+Pz1MExEqq 1n17KWWPfO6ak2Hws5H4VyHbe5O1 X-Google-Smtp-Source: APXvYqw7VpuK6YBQ0H+tYys9OAG/581bJs1Dh7NnRBajBzKowDBASiLkZND0xJwdyWHXGMbD820NAw== X-Received: by 2002:adf:f101:: with SMTP id r1mr28132017wro.251.1555357661701; Mon, 15 Apr 2019 12:47:41 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:41 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:27 +0200 Message-Id: <05f3f1451ae2f32b291ffb5829f371af87f783c5.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 05/12 v3] infra/utils: add helper to generate comma-separated lists 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add a helper macro that, from a space-separated list of items, returns a comma-separated list of the quoted items. This will be useful when we need to generate lists in JSON, later... Code suggested by Thomas P. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Changes v1 -> v2: - don't rely on implicit space in replacement text, instead use explicit $(space) (Thmas DS) --- support/misc/utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/misc/utils.mk b/support/misc/utils.mk index c44319338e..b422c67d76 100644 --- a/support/misc/utils.mk +++ b/support/misc/utils.mk @@ -70,6 +70,10 @@ finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2))) # notfirstword(wordlist): returns all but the first word in wordlist notfirstword = $(wordlist 2,$(words $(1)),$(1)) +# build a comma-separated list of quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d" +make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep From patchwork Mon Apr 15 19:47:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085885 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sQau733o"; dkim-atps=neutral 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 44jfDT744tz9s3q for ; Tue, 16 Apr 2019 05:47:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3DB8985522; Mon, 15 Apr 2019 19:47:50 +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 ROyaQfaTygX2; Mon, 15 Apr 2019 19:47:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C3FAF85657; Mon, 15 Apr 2019 19:47:47 +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 4B71C1BF37A for ; Mon, 15 Apr 2019 19:47:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 440C782115 for ; Mon, 15 Apr 2019 19:47:45 +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 bJZP76Ej33MI for ; Mon, 15 Apr 2019 19:47:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9E10C81FB4 for ; Mon, 15 Apr 2019 19:47:44 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id k11so23536982wro.5 for ; Mon, 15 Apr 2019 12:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=NvxLGJrka58+z8yBXrReq3aH2y3f1whQi1fwZB4TTmM=; b=sQau733ozcsAmBnWwmpYCp4ZOqVTbQ8MKCokTSQj4QryHhm/+N9PW9WWRrH3ma8/cM eMp6i7aHq1qWnU03aKAuTKfvCwvlFiBWljY/Xpiq7LaLMq1Adxo6XuvJkQ7rek8COlZb L141Py4/cn3MxbE89xU8FaxCxuim60goD0bU5Mpc12xXfLFV1SawelRF74MnYGtEaeH1 r7sovp+tGfG3PfJ1AlIR5s6WNNNyPf7pN8TBiZkLSeRRvnjLzdbxQAGuN+8aGwao3hzB vMUa1Bv8D71XzlBvCDzD2h3rWEuhiCIJi+Rr6EX9wcE35aMfxMxhHQmWGrzoiMKDDWqQ FmPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=NvxLGJrka58+z8yBXrReq3aH2y3f1whQi1fwZB4TTmM=; b=M9VxtmP+P2KfnnQHKL07q3qhmL2UgWrAdmvMKqfe89Cq06/cKkV+bz8Eq9d0Y5ZeSJ bzyXaCkHbt+MPeVraOrJXf5atSxFsFRMHnVMYGgZmYZh0EyZizHJESDX2poi6bGGRgKi A9uuJHJyIodMSs5kLgrNza8aBGZg9mARKDawD1+JcUoyrPSVwdUwaSGA2g6FzJEhccva XkhSjLBfSUX6rzsYlkYyrv+nXRsx7v+MWFzPr5QsdYZ/qyW+qOMXLAOyiWtJHfVgFZ4N Corscq9SnU0p4OPPcgBdlMzb5h4bqbq5wzDTVKYgOmzzZXUBtG8nflr4dTVdW6hLcYKU wNhQ== X-Gm-Message-State: APjAAAXTrnEdUUtB9fqOLDAtu2U20s6Ei1K8jo7ghWB48svnrPAWw/eh th8Tg4hKey/qKsq1eKckZfGPhplW X-Google-Smtp-Source: APXvYqzrAWkiAli7ACfjtUOB+E0eJsLOWpKc1wqKXEvNUq/GAoqWWzTKDrU0c1pg0lN6/+h0wd2Zsg== X-Received: by 2002:a05:6000:12c7:: with SMTP id l7mr49498248wrx.4.1555357662928; Mon, 15 Apr 2019 12:47:42 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:42 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:28 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 06/12 v3] fs: introduce variables with name and type 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This makes the filesystems resemble packages yet a bit more, and will allow sorting "items" on their type and names, when indexed from the upper-case names. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Thomas De Schampheleire --- fs/common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/common.mk b/fs/common.mk index 4ad51fdd0a..286d671d06 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -42,6 +42,8 @@ define ROOTFS_REPRODUCIBLE endef endif +ROOTFS_COMMON_NAME = rootfs-common +ROOTFS_COMMON_TYPE = rootfs ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ $(BR2_TAR_HOST_DEPENDENCY) \ @@ -77,6 +79,8 @@ rootfs-common-show-depends: # all variable references except the arguments must be $$-quoted. define inner-rootfs +ROOTFS_$(2)_NAME = rootfs-$(1) +ROOTFS_$(2)_TYPE = rootfs ROOTFS_$(2)_IMAGE_NAME ?= rootfs.$(1) ROOTFS_$(2)_FINAL_IMAGE_NAME = $$(strip $$(ROOTFS_$(2)_IMAGE_NAME)) ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) From patchwork Mon Apr 15 19:47:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085887 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fq6WoKK1"; dkim-atps=neutral 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 44jfDW5przz9s0W for ; Tue, 16 Apr 2019 05:47:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0B6D98254E; Mon, 15 Apr 2019 19:47:52 +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 g9nLK8um4Mxm; Mon, 15 Apr 2019 19:47:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 06662824D4; Mon, 15 Apr 2019 19:47:50 +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 2D0431BF37A for ; Mon, 15 Apr 2019 19:47:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2946782115 for ; Mon, 15 Apr 2019 19:47:46 +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 tG1c1ZDthYo1 for ; Mon, 15 Apr 2019 19:47:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 86F0C81FB4 for ; Mon, 15 Apr 2019 19:47:45 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id w1so23530776wrp.2 for ; Mon, 15 Apr 2019 12:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Fe77T5KRbJVFPSjK+qNQFoSpuAF6v9SX2UfPl4Nzrg=; b=fq6WoKK1TiiQqFu/9E9Qgnhu+FsWvRUbMYD+D81TJgBbJkupAxvquPhXANmRMOrSLL 6l1nU9Z0MNHhgKv+JkjBdGorR+Y+i72TlC+kmGCKbS42KpxQpSUQZ+QQXTeiSjdmAgiw vQPci9+ao2JeVwGBV5HWKoB3pdPMbjrXBWqV0aluflMN4kQhDiby76vyuKny+/BytoQe 845Milo9ULowgsapNvnVBW++Y5Cmtuh326yuhJ6TkK6g1qqn3g8GIWY5cBLVBUgvv5lJ j0SLqH6bzTmbJMYtleo9QgvUf0MaZy8zqMIwToEN69AnM3rUnpNIuA76e3Iq6Q6o8BrQ LAZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1Fe77T5KRbJVFPSjK+qNQFoSpuAF6v9SX2UfPl4Nzrg=; b=E0+1s1qGSvNgy4VcKUH5AC7iGSHNWqbbc5U//yJcWFJH+eX2nNWjEW7RVhCamhY6G/ V8CTlbn/R8YQ+qdGXMprVqwjBar20+WM6M5w+gM/d50Y+4gIf8Htn8ELWRgkJQuuvIc4 zZgeYeKzePKrBIX93NF5a4MT0VRmJatmot+tRPfwZzcAP+SWKer8DzIFtBpui50iszCB wE57RWkugOG8ef8ueu1SFWxVdJqspfyUmsXiXCGPv/QdJ3RGmNv+R7dROJB2u+URlvqg y/WuHhejeQV2fiYVIWkYgZBCov9PmURGji269x66DvzZRFkHAuaqAPkvKVcMXCM34TC8 Wq0A== X-Gm-Message-State: APjAAAVCFX+NdPfQ90nqcOPBxiWPruc7ASgj8omq3rxRAh9ZuXK2rsuq GfLAUJvdClcV3XgTMBbtJmmFBzwf X-Google-Smtp-Source: APXvYqyYZTuZ2oDcy7/5lKpJXaxpYq7mnPBJ8PASuYEuC++ABOQp4RCzE0SOiwEnpbq7nVcF4qmImA== X-Received: by 2002:a5d:6a8a:: with SMTP id s10mr50871692wru.66.1555357664000; Mon, 15 Apr 2019 12:47:44 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:43 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:29 +0200 Message-Id: <4a975afb747616fde0c2cd41ffd0c4ce3b200113.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 07/12 v3] fs: introduce variable with all recursive 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This allows getting all the recursive dependencies of filesystems, ike we have for packages, and allows us to treat both in a similar fashion. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Thomas De Schampheleire --- fs/common.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/fs/common.mk b/fs/common.mk index 286d671d06..5ec28ca183 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -49,6 +49,18 @@ ROOTFS_COMMON_DEPENDENCIES = \ $(BR2_TAR_HOST_DEPENDENCY) \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) +ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES = $(sort \ + $(if $(filter undefined,$(origin ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)), \ + $(eval ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X := \ + $(foreach p, \ + $(ROOTFS_COMMON_DEPENDENCIES), \ + $(p) \ + $($(call UPPERCASE,$(p))_FINAL_RECURSIVE_DEPENDENCIES) \ + ) \ + ) \ + ) \ + $(ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)) + rootfs-common-show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(ROOTFS_COMMON_DEPENDENCIES)) $(info rootfs-common: host) $(info rootfs-common -> $(foreach d,$(ROOTFS_COMMON_DEPENDENCIES),$(d))) @@ -88,6 +100,18 @@ ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target ROOTFS_$(2)_DEPENDENCIES += rootfs-common +ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \ + $$(if $$(filter undefined,$$(origin ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X)), \ + $$(eval ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X := \ + $$(foreach p, \ + $$(ROOTFS_$(2)_DEPENDENCIES), \ + $$(p) \ + $$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES) \ + ) \ + ) \ + ) \ + $$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X)) + rootfs-$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$(ROOTFS_$(2)_DEPENDENCIES)) $$(info rootfs-$(1): host) $$(info rootfs-$(1) -> $$(foreach d,$$(ROOTFS_$(2)_DEPENDENCIES),$$(d))) From patchwork Mon Apr 15 19:47:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085888 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B2LX9ibG"; dkim-atps=neutral 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 44jfDY1189z9s0W for ; Tue, 16 Apr 2019 05:47:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AAB5F84E68; Mon, 15 Apr 2019 19:47:55 +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 4-bOJxZneMZs; Mon, 15 Apr 2019 19:47:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DFB56867FF; Mon, 15 Apr 2019 19:47:50 +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 745791BF37A for ; Mon, 15 Apr 2019 19:47:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 71A9582115 for ; Mon, 15 Apr 2019 19:47:47 +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 jx9A-sq8yZAC for ; Mon, 15 Apr 2019 19:47:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id DC41581FB4 for ; Mon, 15 Apr 2019 19:47:46 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id z11so22259917wmi.0 for ; Mon, 15 Apr 2019 12:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=b3hxgTBs3/1xlvbQnrm0/0r49RFnSZbOTiXuOy/THz4=; b=B2LX9ibGeFcPUs1pH6v7dmrQtCX+d/27Br9X5DuhpqM3PW2VbjBjPzZ3nYdk8RiQ+N 89IO7KMxapNK4WAe7jcRNKVEEaoWrcOoY264LMLz8MWaFHBeC2n56+bbGDqDIX0pW+qn ByrnlhP+o7Y4jlywLrvv2ov9vTClTZV7rhgLWKKgoCUIK5iJStbpKbUdep5LXZ4vk0xd NRt5E19vmdRcCWWeEKMsMUS4CpSDj1mydH9xP8apSdX1GXs1haYk0R7tGiY7PaP9io69 1YCgoUZMiX6BCpS/CbW3Yuqp0ZteP0ZBa9G8VFzJ83S3IFzT4yt2/O3e/nD3XnhOBK/L 02nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=b3hxgTBs3/1xlvbQnrm0/0r49RFnSZbOTiXuOy/THz4=; b=Y+LkB1/Xx6uB38R4rhPDLujmAlKKHwfmwZISglTXMoNTrqFJ9SBuOqFZJ5BfocPFPA romEzkUi/6eO6ljFP7Lzn1SI1+S76/quJIdeIH6JdbUoamrbzZsrfgTTpGnyPLl3XXd9 pyPA/UFMIb4EEgTgkGhi0511RtCZuqEbVOIMwBtgIK4Tziztq8nYBO+iia39AV05fMV5 FMAhAgorZXfaqoTE04ZhkmEld2HcGjxFoVQZb3IRIyZV0dI//aIKA0E8zMWGH8DFazL8 9Kj6KFIdRBC3lLz01Zq3WI7Q1iH1ghvX8Wbz9kzbF5uBrcuqFCSJgFYmh/kFqzGCQUz2 KGFg== X-Gm-Message-State: APjAAAWUFYsGcQpgNUiKWRS1tUb+mbXZBWDG/Euun+gI91nNGlYX4XxB Tjr7MkdMBYYSH4DH6xzaZH1DktFb X-Google-Smtp-Source: APXvYqymdgbE+hRVv7DUxoqNb86RVqUjyqTVTNrBYIkaZIXV1K6i3mwM6614in5JH0enXrPOy8FOog== X-Received: by 2002:a7b:cd08:: with SMTP id f8mr24099029wmj.86.1555357665325; Mon, 15 Apr 2019 12:47:45 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:44 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:30 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 08/12 v3] fs: add all recursive dependencies to packages list 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, only first-level dependencies of a filesystem are added to the global list of packages, thus missing all recursive dependencies. Use the newly introduced recursive variable instead, which already contains the rootfs-common dependencies too. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Thomas De Schampheleire --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 5ec28ca183..f7989eac57 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -190,7 +190,7 @@ rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME) ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) TARGETS_ROOTFS += rootfs-$(1) -PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES) $$(ROOTFS_COMMON_DEPENDENCIES)) +PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES)) endif # Check for legacy POST_TARGETS rules From patchwork Mon Apr 15 19:47:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085891 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E/WdUqo8"; dkim-atps=neutral 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 44jfDj6MMdz9s0W for ; Tue, 16 Apr 2019 05:48:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 54B87857CB; Mon, 15 Apr 2019 19:48:03 +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 hakteq1W07kH; Mon, 15 Apr 2019 19:47:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 99153869CA; Mon, 15 Apr 2019 19:47:52 +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 2CFDD1BF37A for ; Mon, 15 Apr 2019 19:47:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 290B282115 for ; Mon, 15 Apr 2019 19:47:49 +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 i51fi4b+iEJN for ; Mon, 15 Apr 2019 19:47:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5AEDE81FB4 for ; Mon, 15 Apr 2019 19:47:48 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id o25so22139750wmf.5 for ; Mon, 15 Apr 2019 12:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GoCi5E/PX8vflIOt9fsR9Qfm6xZH8xkzXZD+fwrZrfE=; b=E/WdUqo8F7Qgmme2Akjhx/TUcCAFu9D8MUD8taVujTCqsIHWn4RUDBAnYjEw91ptn4 6rocj+/x8RJRnKrZoNis0yTFvrZCxh7POLrrGR02LWqporMexoxt7CEDsHDef8m/jlfY IzUt6zbFn1L1snR/cKdgFSDt2Q4AJQ5V/BtMf8b9kCj1j3E4QdrVqOBJnE/JTccw4liI ShBGumxJQsdkTgIPHpY5agrCBj224FZAcrq2R47tFHgWXxWcrdCqHq9VN0WlABpf1E53 pk7QLqUH8LbWC5kewlBbIKknDm2FdE4Mmso+5CW8gxJ84OQ6XEARuBEz5MHfjL4LKrRF wI/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GoCi5E/PX8vflIOt9fsR9Qfm6xZH8xkzXZD+fwrZrfE=; b=b3+JNKZzZvg/sX50QMi9xwdmEjzaf6dJkqZn9vpTzAJMd9jI9p0h8KHcWnqB9DlmlE xaQ6Igth7dFdfV6wAFN7XUNv1DQqGj5KrUXDXewQ8nKrS0iFTirdp1bf2qWzYehrSTh4 wxiKKo1cfmDeyAqS0Q3Ua0urFmqG52mFs6rMkbtG+knBHGGJ2uAQkbURokpzPAy7Yoq/ fi8PBccXh580Nf0Zkr3z8EP66QLUrE9yMWE63cbKf37kSdmHGwJ1DwKVgfAIqFMbuNrY D1++/G9GfvKNeCVCDOKmDr452fqqY/c63h6xuQuZa6F64C9Dx33RUJW7Go6fAAUnMVx1 RKdg== X-Gm-Message-State: APjAAAXv/m1UHeImJR55TBE5EG7wiDG2XEQ7j86l+ItM/pS4vhcsBua4 GBWui8U2cl3EwF3RTn3ojrvvzpNx X-Google-Smtp-Source: APXvYqwHX7m8gfzQ61Q5C19ZVQMTlv7X7Ow4xNPY9BuYQwtB1FM+xbjsEF3M7zzkfhiJTSDv4enLbQ== X-Received: by 2002:a7b:c353:: with SMTP id l19mr24147721wmj.12.1555357666719; Mon, 15 Apr 2019 12:47:46 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:46 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:31 +0200 Message-Id: <30455cde143814806008e9654974452726602e55.1555357644.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 09/12 v3] core: introduce new global show-info 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Users are increasingly trying to extract information about packages. For example, they might need to get the list of URIs, or the dependencies of a package. Although we do have a bunch of rules to generate some of that, this is done in ad-hoc way, with most of the output formats just ad-hoc, raw, unformatted blurbs, mostly internal data dumped as-is. Introduce a new rule, show-info, that provides a properly formatted output of all the meta-information about packages: name, type, version, licenses, dependencies... We choose to use JSON as the output format, because it is pretty versatile, has parsers in virtually all languages, has tools to parse from the shell (jq). It also closely matches Python data structure, which makes it easy to use with our own internal tools as well. Finally, JSON being a key-value store, allows for easy expanding the output without requiring existing consumers to be updated; new, unknown keys are simply ignored by those (as long as they are true JSON parsers). The complex part of this change was the conditional output of parts of the data: virtual packages have no source, version, license or downloads, unlike non-virtual packages. Same goes for filesystems. We use a wrapper macro, show-info, that de-multiplexes unto either the package-related- or filesystem-related macros, and for packages, we also use a detailed macro for non-virtual packages. It is non-trivial to properly output correct JSON blurbs, especially when trying to output an array of objects, like so, where the last item shall not be followed by a comma: [ { ... }, { ... } ] So, we use a trick (as sugegsted by Arnout), to $(subst) any pair of ",}" or ", }" or ",]" or ", ]" with only the respective closing symbol, "}" or "]". The whole stuff is $(strip)ed to make it a somewhat-minified JSON blurb that fits on a single line with all spaces squashed (but still with spaces, as it is not possible to differentiate spaces between JSON elements from spaces inside JSON strings). Reported-by: Thomas De Schampheleire Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Changes v2 -> v3: - set the virtual field in a single place (Arnout) - rename the macros (Arnout) - don't add opening and closing {} in clean-json (Arnout) - add to 'make help' Changes v1 -> v2: - make it a macro to be called (Arnout) - make it a top-level rule (Arnout) --- Makefile | 16 +++++++++++++ package/pkg-utils.mk | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/Makefile b/Makefile index 60bf7d7d08..0f5331ec7e 100644 --- a/Makefile +++ b/Makefile @@ -903,6 +903,21 @@ check-dependencies: @cd "$(CONFIG_DIR)"; \ $(TOPDIR)/support/scripts/graph-depends -C +.PHONY: show-info +show-info: + @: + $(info $(call clean-json, \ + { $(foreach p, \ + $(sort $(foreach i,$(PACKAGES) $(TARGETS_ROOTFS), \ + $(i) \ + $($(call UPPERCASE,$(i))_FINAL_RECURSIVE_DEPENDENCIES) \ + ) \ + ), \ + $(call json-info,$(call UPPERCASE,$(p)))$(comma) \ + ) } \ + ) \ + ) + else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Some subdirectories are also package names. To avoid that "make linux" @@ -1128,6 +1143,7 @@ help: @echo ' source - download all sources needed for offline-build' @echo ' external-deps - list external packages used' @echo ' legal-info - generate info about license compliance' + @echo ' show-info - generate info about packages, as a JSON blurb' @echo ' printvars - dump internal variables selected with VARS=...' @echo @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index bffd79dfb0..b7280e930f 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -62,6 +62,70 @@ $$(error Package error: use $(2) instead of $(1). Please fix your .mk file) endif endef +# json-info -- return package or filesystem metadata formatted as an entry +# of a JSON dictionnary +# $(1): upper-case package or filesystem name +define json-info + "$($(1)_NAME)": { + "type": "$($(1)_TYPE)", + $(if $(filter rootfs,$($(1)_TYPE)), \ + $(call _json-info-fs,$(1)), \ + $(call _json-info-pkg,$(1)), \ + ) + } +endef + +# _json-info-pkg, _json-info-pkg-details, _json-info-fs: private helpers +# for json-info, above +define _json-info-pkg + $(if $($(1)_IS_VIRTUAL), \ + "virtual": true$(comma), + "virtual": false$(comma) + $(call _json-info-pkg-details,$(1)) \ + ) + "dependencies": [ + $(call make-comma-list,$(sort $($(1)_FINAL_ALL_DEPENDENCIES))) + ], + "reverse_dependencies": [ + $(call make-comma-list,$(sort $($(1)_RDEPENDENCIES))) + ] +endef + +define _json-info-pkg-details + "version": "$($(1)_DL_VERSION)", + "licenses": "$($(1)_LICENSE)", + "downloads": [ + $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), + { + "source": "$(notdir $(dl))", + "uris": [ + $(call make-comma-list, + $(subst \|,|, + $(call DOWNLOAD_URIS,$(dl),$(1)) + ) + ) + ] + }, + ) + ], +endef + +define _json-info-fs + "dependencies": [ + $(call make-comma-list,$(sort $($(1)_DEPENDENCIES))) + ] +endef + +# clean-json -- cleanup pseudo-json into clean json: +# - remove commas before closing ] and } +# - minify with $(strip) +clean-json = $(strip \ + $(subst $(comma)},}, $(subst $(comma)$(space)},$(space)}, \ + $(subst $(comma)],], $(subst $(comma)$(space)],$(space)], \ + $(strip $(1)) \ + )))) \ +) + # # legal-info helper functions # From patchwork Mon Apr 15 19:47:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085892 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OD7rNXkd"; dkim-atps=neutral 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 44jfDl0MPjz9s3q for ; Tue, 16 Apr 2019 05:48:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8439486AE3; Mon, 15 Apr 2019 19:48:05 +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 3n9TYG-tydSO; Mon, 15 Apr 2019 19:47:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8AC9486AFF; Mon, 15 Apr 2019 19:47:54 +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 CF0DE1BF37A for ; Mon, 15 Apr 2019 19:47:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C525E82115 for ; Mon, 15 Apr 2019 19:47:50 +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 rZqkUF4xN51K for ; Mon, 15 Apr 2019 19:47:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by hemlock.osuosl.org (Postfix) with ESMTPS id 78E1181FB4 for ; Mon, 15 Apr 2019 19:47:49 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id k11so23537262wro.5 for ; Mon, 15 Apr 2019 12:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BA1h/1h1v06I+Cg+B8L1LUVTapRQt56sWejIPjcXegI=; b=OD7rNXkddxpClL4cE1FgdoQKfPpCj1pLHJbNEmJRZmzY7xL8hxrzS+P5pGnUlz0atZ zb62AJdal0walGEAqAGGovBYwjOSneWHM7sNEA7IpeRTCU0j3DPY3rc+7hc8xMqyuN9r cGvvGaiEuvRtECxQyGiNnL8MN7c0l8/WidbC2yRJ8lqg9HyGoAb6avTzwgBzlrVnNmo4 fjUGdv8QzfxYrHNOFe1Fs2YNKA02l0V+zbnN1kaTgmsfmxFCRT8mXAOX7x/L4pryW74/ n6zW8EEIrnsOSaKMmsCXyNWcDwBs1cvRKIHThVyPuchdHG1JCCHf4Mr1AKtRYIKTnfbQ X0wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BA1h/1h1v06I+Cg+B8L1LUVTapRQt56sWejIPjcXegI=; b=Ym+FXVVyuliTItR1nOxcsv4qTROZ7hCb+exOTZd86QBazGBXPBlZHMXqRmIRJXefPI dqqJ8NwMs1r86bENlGHK9qlnIZ3cWypldjHsx+pYeQLRvsRwTojrO5H1smmzMaz6rVve h1lwX8kZdyysYGfWlJlJsRsgCsU+SPmXXvWaQira2rV9MuJc9V8iMTXXV9b+flY9Twgq E4Qmp6Qc7DxqpaRw5sQ0GITkriwQO//YhzuWV9IfXSjJ6cU2C89wte4Mij4WQsJEYKgV YAE3leLqSWK0vMpgDJPXcVUfshMJr8R4IYW77EZil4hQhGrf/8Fn5kR0VWAYsfQmQLdQ q3zw== X-Gm-Message-State: APjAAAXWuZNNbkhTM35TDBcHjwRUHjKSqfbtRDyOw9SX4tf+S1uA6tCl QEs2gYKj1rop9Y0AB5olryxe6NK8 X-Google-Smtp-Source: APXvYqzNG9jH8JyGS0jONVhgIexDmY+2YuFS6CwIdxBxFdR1B/FCnqmtQSKKR0KgLdo3uh1CqBdVcw== X-Received: by 2002:a5d:458d:: with SMTP id p13mr50480633wrq.224.1555357667884; Mon, 15 Apr 2019 12:47:47 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:47 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:32 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 10/12 v3] core: add per-package and per-filesystem show-info 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Sometimes, it is need to quickly get the metadata of a subset of packages, without resorting to a full-blown JSON query. Introduce a new per-package (and per-filesystem) foo-show-info rule, that otputs a per-entity valid JSON blob. Note that calling it for multiple packages and.or filesystems at once will not generate a valid JSON blob, as there would be no separator between the JSON elements: $ make {foo,bar}-show-info { "foo": { foo stuff } } { "bar": { bar stuff } } However, jq is able to absorb this, with its slurping ability, which generates an array (ellipsed and manualy reformated for readability): $ make {foo,bar}-show-info |jq -s . - [ { "foo": { foo stuff } }, { "bar": { bar stuff } } ] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle --- Changes v2 -> v3: - add to 'make help' Changes v1 -> v2: - make it based on the new show-info macro (Arnout) --- Makefile | 1 + fs/common.mk | 11 ++++++++++- package/pkg-generic.mk | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0f5331ec7e..522c0b0606 100644 --- a/Makefile +++ b/Makefile @@ -1111,6 +1111,7 @@ help: @echo ' -depends - Build '\''s dependencies' @echo ' -configure - Build up to the configure step' @echo ' -build - Build up to the build step' + @echo ' -show-info - generate info about , as a JSON blurb' @echo ' -show-depends - List packages on which depends' @echo ' -show-rdepends - List packages which have as a dependency' @echo ' -show-recursive-depends' diff --git a/fs/common.mk b/fs/common.mk index f7989eac57..6dd1774726 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -87,6 +87,11 @@ endif rootfs-common-show-depends: @echo $(ROOTFS_COMMON_DEPENDENCIES) +.PHONY: rootfs-common-show-info +rootfs-common-show-info: + @: + $(info $(call clean-json,{ $(call json-info,ROOTFS_COMMON) })) + # Since this function will be called from within an $(eval ...) # all variable references except the arguments must be $$-quoted. define inner-rootfs @@ -184,9 +189,13 @@ endif rootfs-$(1)-show-depends: @echo $$(ROOTFS_$(2)_DEPENDENCIES) +rootfs-$(1)-show-info: + @: + $$(info $$(call clean-json,{ $$(call json-info,ROOTFS_$(2)) })) + rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME) -.PHONY: rootfs-$(1) rootfs-$(1)-show-depends +.PHONY: rootfs-$(1) rootfs-$(1)-show-depends rootfs-$(1)-show-info ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) TARGETS_ROOTFS += rootfs-$(1) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 8ff8cff12d..67782138b4 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -867,6 +867,10 @@ $(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$($(2)_FINAL_AL $$(info $(1): $(4) $$(if $$($(2)_IS_VIRTUAL),virtual,$$($(2)_DL_VERSION))) $$(info $(1) -> $$($(2)_FINAL_ALL_DEPENDENCIES)) +$(1)-show-info: + @: + $$(info $$(call clean-json,{ $$(call json-info,$(2)) })) + $(1)-graph-depends: graph-depends-requirements $(call pkg-graph-depends,$(1),--direct) @@ -1099,6 +1103,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) $(1)-rsync \ $(1)-show-dependency-tree \ $(1)-show-depends \ + $(1)-show-info \ $(1)-show-version \ $(1)-source From patchwork Mon Apr 15 19:47:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085889 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Vyj1qJrD"; dkim-atps=neutral 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 44jfDf5T7Hz9s0W for ; Tue, 16 Apr 2019 05:48:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4BF99859ED; Mon, 15 Apr 2019 19:48:00 +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 nmI5w1o7olpD; Mon, 15 Apr 2019 19:47:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 91098824D4; Mon, 15 Apr 2019 19:47:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 725A71BF37A for ; Mon, 15 Apr 2019 19:47:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3B0212420F for ; Mon, 15 Apr 2019 19:47:54 +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 AwUKs+Kv7r0k for ; Mon, 15 Apr 2019 19:47:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by silver.osuosl.org (Postfix) with ESMTPS id C75CD22802 for ; Mon, 15 Apr 2019 19:47:50 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id p10so23532742wrq.1 for ; Mon, 15 Apr 2019 12:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8FH91BD5qDmtJUpsVIJTapmAouDbicYyU7C9F6uGuRo=; b=Vyj1qJrDWQKKtdhobA4Ro4B3C9wlqziHtR5vuxHlko7XYMalpZIFhdF4gvkCuxi8pr 41nAUjS5j1U4mEO2Dr5Ar3aUCXWnCrR6Ky7Dz2c4Q0/6wDjyPbF4Hl+rQhLYotgJfLn7 VJ+15mn5gpRBa7h5yW6evvvCXeF1R5d15s7AvqtQI0VvQqiwGv9IvBWv36yzLbS3B+0s 4h/R+x2FcHwC8n/A9WpZESMABSifU1pAVgBafz871p6VsLAu+QkrUXvlwWR9Ex8fwp7e xtOAGEsvcXgEVZwtBNqnTc6vqscJev9uVmB6DIv0Wk12K0aT8vkRpy3bNmHQ8DHDkwYr RtqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8FH91BD5qDmtJUpsVIJTapmAouDbicYyU7C9F6uGuRo=; b=ruzqnKNGOIxml/LRII60bvVK0oLMSBrrrHpd+KCfYBwOqNmucX4ga7uL5xTeVE4hKM qFVTIvLcFvbl/ICFinT9zkCXRsPd1FfanmaSi7GZMqlq/rzuylm8GyoEbfQeIQK1PT1G /UAhXKzYV2Djk63Nx9neSy/uANtmDqa/KtJkumN9mf5soow8BUQIxguK7SaDmm1hr5Pk HE7aU0Uug8WY8cs29AdIXJWPv8XOIa2c/egBCBHrw+hPR0hg/o7yU64DSQ2qtjIcVYBo StKYWJ9FYGfYbN9dNO8nhL2p8mjogq1PCimCgFGQ1AxOVP1jMFevMHS492z70aQl3FvL TnPA== X-Gm-Message-State: APjAAAUqKxkDeGBt6HysGISiY9lH8emxbiUOvuVh8GQ2/sKNR1m4ArtQ OrPqPI66XmfrZjhco2RnA5m7JjeK X-Google-Smtp-Source: APXvYqyyOUWW8UniySnRRXEQkvyan/JhwZlZy2V/Mz/GJph7xRW/R319DrlTqcaUpIPAfdL0uWDAoA== X-Received: by 2002:a5d:5284:: with SMTP id c4mr29972656wrv.281.1555357669148; Mon, 15 Apr 2019 12:47:49 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:48 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:33 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 11/12 v3] support/scripts: use show-info to extract dependency graph 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 De Schampheleire , Ricardo Martincoski , Thomas Petazzoni , "Yann E. MORIN" , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, we extract the dependency graph from the aptly named but ad-hoc show-dependency-graph rule. We now have a better solution to report package information, with show-info. Since show-dependency-graph never went into a release so far, and show-info does provide the same (and more), swith to using show-info. Thanks to Adam for suggesting the coding style to have a readable code that is not ugly but still pleases flake8. Thanks to Arnout for suggesting the use of dict.get() to further simplify the code. Note: we do not use th reverse_dependencies field because it only contains those packages that have a kconfig option, so we'd miss most host packages. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Adam Duskett Cc: Arnout Vandecappelle Cc: Ricardo Martincoski --- support/scripts/brpkgutil.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/support/scripts/brpkgutil.py b/support/scripts/brpkgutil.py index f65068d348..780cdef49c 100644 --- a/support/scripts/brpkgutil.py +++ b/support/scripts/brpkgutil.py @@ -1,12 +1,12 @@ # Copyright (C) 2010-2013 Thomas Petazzoni # Copyright (C) 2019 Yann E. MORIN +import json import logging import os import subprocess from collections import defaultdict - # This function returns a tuple of four dictionaries, all using package # names as keys: # - a dictionary which values are the lists of packages that are the @@ -19,7 +19,7 @@ from collections import defaultdict def get_dependency_tree(): logging.info("Getting dependency tree...") - deps = defaultdict(list) + deps = {} rdeps = defaultdict(list) types = {} versions = {} @@ -29,23 +29,21 @@ def get_dependency_tree(): types['all'] = 'target' versions['all'] = '' - cmd = ["make", "-s", "--no-print-directory", "show-dependency-tree"] + cmd = ["make", "-s", "--no-print-directory", "show-info"] with open(os.devnull, 'wb') as devnull: p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=devnull, universal_newlines=True) - output = p.communicate()[0] + pkg_list = json.loads(p.communicate()[0]) - for l in output.splitlines(): - if " -> " in l: - pkg = l.split(" -> ")[0] - deps[pkg] += l.split(" -> ")[1].split() - for p in l.split(" -> ")[1].split(): - rdeps[p].append(pkg) - else: - pkg, type_version = l.split(": ", 1) - t, v = "{} -".format(type_version).split(None, 2)[:2] - deps['all'].append(pkg) - types[pkg] = t - versions[pkg] = v + for pkg in pkg_list: + deps['all'].append(pkg) + types[pkg] = pkg_list[pkg]["type"] + deps[pkg] = pkg_list[pkg].get("dependencies", []) + for p in deps[pkg]: + rdeps[p].append(pkg) + versions[pkg] = \ + None if pkg_list[pkg]["type"] == "rootfs" \ + else "virtual" if pkg_list[pkg]["virtual"] \ + else pkg_list[pkg]["version"] return (deps, rdeps, types, versions) From patchwork Mon Apr 15 19:47:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1085890 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p38Q3Cib"; dkim-atps=neutral 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 44jfDg0nbTz9s3q for ; Tue, 16 Apr 2019 05:48:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 85784824D4; Mon, 15 Apr 2019 19:48:00 +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 FCGujESetk89; Mon, 15 Apr 2019 19:47:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5678783020; Mon, 15 Apr 2019 19:47:58 +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 DEEA81BF37A for ; Mon, 15 Apr 2019 19:47:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DA24D86AC7 for ; Mon, 15 Apr 2019 19:47:56 +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 gTkUT+LVoxvf for ; Mon, 15 Apr 2019 19:47:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 10B9386A1E for ; Mon, 15 Apr 2019 19:47:52 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id g3so23484017wrx.9 for ; Mon, 15 Apr 2019 12:47:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Zjij0qC6e3VpjXk8s+tHhksCztwQB52vwubDaUCrhk=; b=p38Q3CibnerLhGgH32z9o7YRV5fnAjfnTGRzH7/15ybSF5w1+cwLjTlQXnrzsd3Lf4 z0L1zWd5rHoX6uZd7B5DpsE/7mo310J4yrRH1Sz5rQ1CMlC2Gj6wqubOL2kVQ97Ajt4u JfH199l9cSilZ8PKnCwhfelDBKU4fUjMyWxuOkwm5GO1L6Fm17M81wmEei9qnTe7bY/b nA4ZTqVCmUjsta/ZGS2l3EAB6G2QPCh79PDqFzbgE+3HhS4GK/npFp4hzBymqrTFV5iz XsIYauuRcu8qkob65bzcXNmtqiR8mfhhb9yJC5SCKsHdin9ib3A+OP1kwMHGiIyhyTXz /1vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1Zjij0qC6e3VpjXk8s+tHhksCztwQB52vwubDaUCrhk=; b=KvmO/51r6QQI5w7h2nnJoKO3qzgCaC9ArCYvh+Yb/+kS43Zy6/ff1qao8Hh3pcML4U OKGzJi33N/b/oAme0B09O8s2vkG+jF+fd7uf5IQ6Eah7f7HZwspY37bPgOeSq/WBqoGc Kq3xcnEpkjTumEgP4D/hgWwMqidUAxMm5Zf3ja19FKHdy0n9XpEoEQMfcH+h7r0O48h9 LHXXbL25Pi5V64+yDAT0nDajKK2OLOyc7vOyfbVTl21ppHhnPymr6R5rItvj77Y8IYeG eXT6p1in29UuR8zZdoLi+floqprjY1SpOyniOaeHM1tk+G1CZguadIG3ORiynWRvYZoZ gCXw== X-Gm-Message-State: APjAAAW33YPsqUEaEnSOrhI7eoq7R4utPW5UeDoVkTQFzTi0HF2Pm5eO Jg66b49eVFzwpNNPe5UjnIODJdte X-Google-Smtp-Source: APXvYqyWyQ78GWQ1WQLyTOVozMLYuuhBbKrakrpVanw4Hpjcfu+q/RJvf1hH+HYF53t0nxMoZgrt7g== X-Received: by 2002:a5d:4047:: with SMTP id w7mr51139334wrp.255.1555357670428; Mon, 15 Apr 2019 12:47:50 -0700 (PDT) Received: from scaer.home ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id z74sm1479222wmc.2.2019.04.15.12.47.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:47:49 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 15 Apr 2019 21:47:34 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 12/12 v3] core: remove show-depednency-tree 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 De Schampheleire , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" show-depednency-tree was introduced in this release cycle, as a way to quickly and easily provide the dependency tree to geaph-depends. show-dependency-tree is no longer used, no that graph-depends has been switched over to using the more versatile show-info. Beside, show-dependency-tree has never been part of a release. Drop it. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle --- Makefile | 4 ---- fs/common.mk | 8 -------- package/pkg-generic.mk | 6 ------ 3 files changed, 18 deletions(-) diff --git a/Makefile b/Makefile index 522c0b0606..f1e70551d8 100644 --- a/Makefile +++ b/Makefile @@ -876,10 +876,6 @@ graph-depends-requirements: @dot -? >/dev/null 2>&1 || \ { echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; } -.PHONY: show-dependency-tree -show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(PACKAGES) $(TARGETS_ROOTFS)) - @: - .PHONY: graph-depends graph-depends: graph-depends-requirements @$(INSTALL) -d $(GRAPHS_DIR) diff --git a/fs/common.mk b/fs/common.mk index 6dd1774726..fceb38c5b9 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -61,10 +61,6 @@ ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES = $(sort \ ) \ $(ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)) -rootfs-common-show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(ROOTFS_COMMON_DEPENDENCIES)) - $(info rootfs-common: host) - $(info rootfs-common -> $(foreach d,$(ROOTFS_COMMON_DEPENDENCIES),$(d))) - .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating root filesystems common tables") @@ -117,10 +113,6 @@ ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \ ) \ $$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X)) -rootfs-$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$(ROOTFS_$(2)_DEPENDENCIES)) - $$(info rootfs-$(1): host) - $$(info rootfs-$(1) -> $$(foreach d,$$(ROOTFS_$(2)_DEPENDENCIES),$$(d))) - ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 67782138b4..e44f5d913c 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -862,11 +862,6 @@ $(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPEND @: $$(info $(1)) -$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$($(2)_FINAL_ALL_DEPENDENCIES)) - @: - $$(info $(1): $(4) $$(if $$($(2)_IS_VIRTUAL),virtual,$$($(2)_DL_VERSION))) - $$(info $(1) -> $$($(2)_FINAL_ALL_DEPENDENCIES)) - $(1)-show-info: @: $$(info $$(call clean-json,{ $$(call json-info,$(2)) })) @@ -1101,7 +1096,6 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) $(1)-reconfigure \ $(1)-reinstall \ $(1)-rsync \ - $(1)-show-dependency-tree \ $(1)-show-depends \ $(1)-show-info \ $(1)-show-version \