From patchwork Thu Jan 28 18:15:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 574827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 450AD140BF8 for ; Fri, 29 Jan 2016 05:16:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ZiVcNyoY; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ECB92920A4; Thu, 28 Jan 2016 18:16:04 +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 gNj4ptPFIRNv; Thu, 28 Jan 2016 18:16:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CD4F9920AE; Thu, 28 Jan 2016 18:15:41 +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 CE2EB1C1098 for ; Thu, 28 Jan 2016 18:15:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C8BD0A5A57 for ; Thu, 28 Jan 2016 18:15:34 +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 K7j68e3nTuf6 for ; Thu, 28 Jan 2016 18:15:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E784B84812 for ; Thu, 28 Jan 2016 18:15:33 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id r129so5340914wmr.0 for ; Thu, 28 Jan 2016 10:15:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MPHNm7uUAmQkpBAz7zaF02opqnNfKZt7N197rzPvoVY=; b=ZiVcNyoYIIcLjPkfgwb4sjMpyaNCtmkwni4hUzMBjZO/XHccbuPxuxvo1QhCbQ2I7X gASk7vUHi5Fd2ePlUFP6Is/OB8S2XLhpsfcI1cQrZOqrhtnuPNW2a317qZgp1xxJAkHO rxnvUQTgNOQviWfIMw0w+OIQbJqSeREaWaSD9vuLbkhigxbTjOS8qSF4f6n0wmiMivzB T+R773Sg1nX5yPyIMOv4WXXOLxQlk052vnwpcAMDd7sSvVWPPHSCUbFdohlE10BoQ8Ti TCoCaIQ1ZlWgn4O3gdxVzQLYbyLadiHJy3dn+UypBuJ0L9Le4RXlHBIz1RNEgIZygqOI GNHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MPHNm7uUAmQkpBAz7zaF02opqnNfKZt7N197rzPvoVY=; b=PyBq9ARot7TNt1pIkIPZ9l37ASYryLCGOHjKuhyP1NvUR9jiPU+paVyfMXey7JXAap Y36UN3UEHwl37xdbBXwPCu+1LXZy4AnzdKtW/wkQnYjfQQ4rE0Phvy4EpMyWW0EuZnXw m9e/bJR2JvWca3j15T5SX99Hn4P2NcxJTELtAdhWFfo0FtMvnLyqV/hOSw5PDETB0Xs0 7DqyjzCdxKJ/o5KAt8yWdxteEHU/JGfAhk8b7JmnIRE7SnHyf//9gRBdg+VYZqlShZPF tFAVsjxT47ZDd/81mvgncdeyAwYIENFzWRW3aVlbWmJHOLqns7nWJhVt5wFvsGeBeiAX JOJg== X-Gm-Message-State: AG10YOStooOcWLpmtDD9j0UrouXGncCppQmZpOBQiyPdPpn1smgL0XO+QvRL4zZzAO7wOg== X-Received: by 10.194.250.39 with SMTP id yz7mr5123802wjc.92.1454004932655; Thu, 28 Jan 2016 10:15:32 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id g1sm3353811wmc.0.2016.01.28.10.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jan 2016 10:15:31 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Thu, 28 Jan 2016 19:15:07 +0100 Message-Id: <482547d6ea8a858dfe0a0b61e3e9c943e216573e.1454004518.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Luca Ceresoli , "Yann E. MORIN" Subject: [Buildroot] [PATCH 09/16 v3] core/legal-info: add package version to license directory X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Now that we save the source archives in a directory named after the package and its version, do the same for the license files, for consistency. It has a not-so-bad side-effect of also saving the version string in the all-licenses list. The only (small) side-effect, is that the warnings about undefined _LICENSE_FILES now contains the version string, too. That's unavoidable, since that's what is stored in the legal report. Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli Acked-by: Luca Ceresoli Tested-by: Luca Ceresoli --- Changes v1 -> v2: - s/drawback/side-effect/ (Luca) --- package/pkg-generic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 27fd98d..7ad3bc3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -805,10 +805,10 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) # is that the license still applies to the files distributed as part # of the rootfs, even if the sources are not themselves redistributed. ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) - @$$(call legal-license-nofiles,$$($(2)_RAWNAME),$$(call UPPERCASE,$(4))) - @$$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined)) + @$$(call legal-license-nofiles,$$($(2)_RAWNAME_VERSION),$$(call UPPERCASE,$(4))) + @$$(call legal-warning-pkg,$$($(2)_RAWNAME_VERSION),cannot save license ($(2)_LICENSE_FILES not defined)) else - @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME_VERSION),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local)