From patchwork Thu Apr 12 03:02:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danomi Manchego X-Patchwork-Id: 897452 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=fail (p=none dis=none) header.from=gmail.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40M5L74xYKz9s25 for ; Thu, 12 Apr 2018 13:02:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9129988757; Thu, 12 Apr 2018 03:02:21 +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 fZ2FzOKdVfn0; Thu, 12 Apr 2018 03:02:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0E2C187B36; Thu, 12 Apr 2018 03:02:21 +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 EC3D41C125C for ; Thu, 12 Apr 2018 03:02:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E97B92281A for ; Thu, 12 Apr 2018 03:02:19 +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 bqF6FYd13gih for ; Thu, 12 Apr 2018 03:02:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from resqmta-ch2-06v.sys.comcast.net (resqmta-ch2-06v.sys.comcast.net [69.252.207.38]) by silver.osuosl.org (Postfix) with ESMTPS id 4FBC922819 for ; Thu, 12 Apr 2018 03:02:19 +0000 (UTC) Received: from resomta-ch2-15v.sys.comcast.net ([69.252.207.111]) by resqmta-ch2-06v.sys.comcast.net with ESMTP id 6SV8fjiRPsRj36SV8fpwGa; Thu, 12 Apr 2018 03:02:18 +0000 Received: from dmocelo-Aspire-E5-575G.hsd1.nj.comcast.net ([IPv6:2601:87:c480:4d8f:a370:1318:5844:fc41]) by resomta-ch2-15v.sys.comcast.net with SMTP id 6SV2fasLMCP4V6SV7fwVKD; Thu, 12 Apr 2018 03:02:18 +0000 From: Danomi Manchego To: buildroot@buildroot.org Date: Wed, 11 Apr 2018 23:02:10 -0400 Message-Id: <1523502130-21870-1-git-send-email-danomimanchego123@gmail.com> X-Mailer: git-send-email 2.7.4 X-CMAE-Envelope: MS4wfNx2NHOmVdAZ71Wx7+zHauWjVhyuQftuPrdVdwgRo537UIf5NQ1Ga8St6d8zBN/Isw1b0UQWo5tya8MmZ5bI8Gen8lXeDwdkOQQyW9cBGHWm4ZQ56L7x 5RLJVGDaZVHrtCwAWbGRYJoREdSyEX4JNC84JwWz2ZuX1CNX+4U+p3KyvOOfOKQx4fwEvuC+XKFQM1GgxpgLtrwoQgppv378uVURaOC0NcJD2SOYCYwYxfKE J6SJVpPZAY4tr84w4BXrvYjA2bTPtaq3nESbucipdgQ= Subject: [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, GST1_PLUGINS_BAD_LICENSE_FILES starts out set to both the GPL COPYING file and the LGPL COPYING.LIB file, but the GST1_PLUGINS_BAD_LICENSE handling only claims LGPL, and then intelligently adds GPL if needed. This change moves the GPL file addition to the same conditional clause so that the GPL file is included in the legal-info location only if GPL code is actually used. Signed-off-by: Danomi Manchego Reviewed-by: "Yann E. MORIN" --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 83cb94b..9f7cd97 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -8,9 +8,9 @@ GST1_PLUGINS_BAD_VERSION = 1.12.4 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB -# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if -# enabled. +# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and +# GST1_PLUGINS_BAD_LICENSE_FILES if enabled. +GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \ @@ -772,6 +772,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_LICENSE += GPL +GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif # Add Unknown license if Unknown licensed plugins enabled.