From patchwork Mon Nov 16 22:47:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 545256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7E34014145E for ; Tue, 17 Nov 2015 09:48:11 +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=TJistI24; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C396688394; Mon, 16 Nov 2015 22:47:58 +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 YlxF+YaW8FTN; Mon, 16 Nov 2015 22:47:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 18FCC88034; Mon, 16 Nov 2015 22:47:58 +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 0371D1C11DF for ; Mon, 16 Nov 2015 22:47:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F0A3A2525B for ; Mon, 16 Nov 2015 22:47:44 +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 c3+2mO+pAxuT for ; Mon, 16 Nov 2015 22:47:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by silver.osuosl.org (Postfix) with ESMTPS id F1839264FB for ; Mon, 16 Nov 2015 22:47:43 +0000 (UTC) Received: by wmec201 with SMTP id c201so200798756wme.0 for ; Mon, 16 Nov 2015 14:47:42 -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=//rxnsc8kqJDXCNdxQMmjPrUUUaglTIt8o1WtZvB9Xc=; b=TJistI24RRRskVSjjUKf4H5IMsXkc6ZS0z8R0DWKC5dJVEuScAaPfmra7tdKQWNWn+ SGk4a5PE8cJPh8QYn9JtntRgYaL6ZnCIESDbFAANWh0v8a8lLVGU/xLOVSfHkkKFnwVP duY88uCGg6mHBM3hUr7cax09XlwAv4pf3ZCxHapCuD4M45BLvDH6Y1VsJeTVK5kNUJOH vINNqM26lMkU/tqn+XqGOoX+h58JGKbiFHNdG0wgiqSLIVazpEaX06Wt01dYoCF/PUR7 YWsi+z33OmxXA0l7P+60zM+ejTMXyUhBP4BgQNA8mIoxcEnzQkEJWZNDGbE4zGR101pI ghVw== X-Received: by 10.194.47.134 with SMTP id d6mr39577957wjn.27.1447714062722; Mon, 16 Nov 2015 14:47:42 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id ka10sm36677165wjc.30.2015.11.16.14.47.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Nov 2015 14:47:42 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 16 Nov 2015 23:47:13 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Luca Ceresoli , "Yann E. MORIN" Subject: [Buildroot] [PATCH 18/21 RFC] 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 consistenmcy. Also save the version string in the all-licenses list. However, do not print the version string when warning about undefined _LICENSE_FILES (it's ugly otherwise). Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli --- package/pkg-generic.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6e53c59..d808055 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -801,10 +801,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-license-nofiles,$$($(2)_RAWNAME)-$$($(2)_VERSION),$$(call UPPERCASE,$(4))) @$$(call legal-warning-pkg,$$($(2)_RAWNAME),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)-$$($(2)_VERSION),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local)