From patchwork Thu Oct 11 16:12:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 982587 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZXe8tCQm"; 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 42WGHC49zmz9s7W for ; Fri, 12 Oct 2018 03:13:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EFB6F86D26; Thu, 11 Oct 2018 16:13:39 +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 zJ0aomK0g78T; Thu, 11 Oct 2018 16:13:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1AA7F85078; Thu, 11 Oct 2018 16:13:37 +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 185DF1BF487 for ; Thu, 11 Oct 2018 16:13:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1563A8767F for ; Thu, 11 Oct 2018 16:13:36 +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 MdrpzXRpmXmS for ; Thu, 11 Oct 2018 16:13:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 46E2C87800 for ; Thu, 11 Oct 2018 16:13:34 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id y140-v6so16117204wmd.0 for ; Thu, 11 Oct 2018 09:13:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v5v6kz65UCn/Oblbx7AaAoDErFoWsACMrIF1iRte6EE=; b=ZXe8tCQmZpunq8P8k2V64I57HdG4MuKHCdzOUZCOcoA97flU1CwIQsrN6O9fISnq1l WnZVKmZHbu5K/VsNQ4pErRqq7GNI44cBwk30sgkw/rOPda44QrvjXHsKFTsV/65X1FIN H2mFHJDvmMNwvw+6mLKTKVQ6M00twwOeHeYoYH/6ytdzYDFA/n2is1y6mtr+/a5whHYf tRoxf9IlL3+oGEuI+x7uuw5Ao/t5jbEhIgQbUsZBAWmHI3LyACPB0deIQM2HHX7yyYQO LPsAluW7zbZpgLVLXAyFjlZBRPCHDyLvGaC9PoG40UpWzsm6ICK4Sv314Ig8FpsAhoL9 yCXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v5v6kz65UCn/Oblbx7AaAoDErFoWsACMrIF1iRte6EE=; b=ARz4HekAktsYcG+O9DykQoYeC1fkfre9nYfyaxzF/r6I93AC5cA4f/HE2oIQrwrBJq IG0/6TV1Kcx3CfMvRCD7pFz+iXHrCUfou2Lq77wZCxRRzfLZFKHX+Mar+b2N9jQpe2JU r67tYpaCB/3w2BEJMhrfJ8df7LdEIOEOglkWjgVFRI9TUWcx+BHuYrqpiqStpb9pYBnD VgkxpayYboDicmb5pQsxDbqcn7cIFAU2egv0COzvgYy8oxp7xL9U7iFTk4X1hL4g7Aw3 CZDnJcbe4qRN6Glc7oWR4Hup8EWHuZWdEN8uC4orR4JDuU7c0XEVC+bLiTFy6dYAPh1G shFQ== X-Gm-Message-State: ABuFfoiGRevhJBTlwlgM3QUvil1ekEMcbxJr1c5Ce8V+SRAzlM55gdEB WN1RMYGjtCnNEaNdwk0AzP7aPwai X-Google-Smtp-Source: ACcGV60SWgtIzumw997VE5604BmT1aVBUSn0WjfVM3S1hGfcmbN+hRCxyd6M0kwFhuAW6W6i20l2rw== X-Received: by 2002:a1c:2dc5:: with SMTP id t188-v6mr2178258wmt.94.1539274412538; Thu, 11 Oct 2018 09:13:32 -0700 (PDT) Received: from vb-18.04 (37.176.132.77.rev.sfr.net. [77.132.176.37]) by smtp.gmail.com with ESMTPSA id 77-v6sm37609687wmv.6.2018.10.11.09.13.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 09:13:32 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Thu, 11 Oct 2018 18:12:45 +0200 Message-Id: <20181011161248.13457-2-francois.perrad@gadz.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011161248.13457-1-francois.perrad@gadz.org> References: <20181011161248.13457-1-francois.perrad@gadz.org> Subject: [Buildroot] [V2 1/4] scancpan: add PERL_FOO_DISTNAME in perl-foo.mk 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" this variable is needed for upgrading package with scancpan Signed-off-by: Francois Perrad --- docs/manual/adding-packages-perl.txt | 10 +++++++--- utils/scancpan | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt index eb14d9de1..6ce693fd6 100644 --- a/docs/manual/adding-packages-perl.txt +++ b/docs/manual/adding-packages-perl.txt @@ -23,8 +23,9 @@ with an example : 10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures 11: PERL_FOO_BAR_LICENSE = Artistic or GPL-1.0+ 12: PERL_FOO_BAR_LICENSE_FILES = LICENSE -13: -14: $(eval $(perl-package)) +13: PERL_FOO_BAR_DISTNAME = Foo-Bar +14: +15: $(eval $(perl-package)) ------------------------ On line 7, we declare the version of the package. @@ -40,7 +41,10 @@ On line 11 and 12, we give licensing details about the package (its license on line 11, and the file containing the license text on line 12). -Finally, on line 14, we invoke the +perl-package+ macro that +On line 13, the name of the distribution as needed by the script ++utils/scancpan+ (in order to regenerate/upgrade these package files). + +Finally, on line 15, we invoke the +perl-package+ macro that generates all the Makefile rules that actually allow the package to be built. diff --git a/utils/scancpan b/utils/scancpan index 01f3abdc8..f2e06a3dc 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -747,6 +747,7 @@ while (my ($distname, $dist) = each %dist) { say {$fh} qq{HOST_${brname}_DEPENDENCIES = ${host_dependencies}} if $need_host{$distname} && $host_dependencies; say {$fh} qq{${brname}_LICENSE = ${license}} if $license; say {$fh} qq{${brname}_LICENSE_FILES = ${license_files}} if $license_files; + say {$fh} qq{${brname}_DISTNAME = ${distname}}; say {$fh} qq{}; foreach (sort @{$deps_optional{$distname}}) { next if grep { $_ eq $distname; } @{$deps_runtime{$_}}; # avoid cyclic dependencies