diff mbox series

[1/2] gst1-plugins-bad: rework license type construction

Message ID 1525633443-942-1-git-send-email-danomimanchego123@gmail.com
State Accepted
Headers show
Series [1/2] gst1-plugins-bad: rework license type construction | expand

Commit Message

Danomi Manchego May 6, 2018, 7:04 p.m. UTC
Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct
so that the list of licenses is presented as a comma-separated list.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Yann E. MORIN May 13, 2018, 9:04 p.m. UTC | #1
Danomi, All,

On 2018-05-06 15:04 -0400, Danomi Manchego spake thusly:
> Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct
> so that the list of licenses is presented as a comma-separated list.
> 
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 +++---
>  1 file changed, 3 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 9f7cd97..b001c33 100644
> --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> @@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES
>  # 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_LICENSE := LGPL-2.0+, LGPL-2.1+
>  
>  GST1_PLUGINS_BAD_CONF_OPTS = \
>  	--disable-examples \
> @@ -771,13 +771,13 @@ 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 := $(GST1_PLUGINS_BAD_LICENSE), GPL
>  GST1_PLUGINS_BAD_LICENSE_FILES += COPYING
>  endif
>  
>  # Add Unknown license if Unknown licensed plugins enabled.
>  ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y)
> -GST1_PLUGINS_BAD_LICENSE += UNKNOWN
> +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN
>  endif
>  
>  # Use the following command to extract license info for plugins.
> -- 
> 2.7.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni May 13, 2018, 9:22 p.m. UTC | #2
Hello,

On Sun,  6 May 2018 15:04:02 -0400, Danomi Manchego wrote:
> Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct
> so that the list of licenses is presented as a comma-separated list.
> 
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

I've applied to master, thanks! One comment below though.

>  # 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 := $(GST1_PLUGINS_BAD_LICENSE), GPL

It would be nice to make this vague "GPL" statement a bit clearer. Are
we talking about GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+ ? Or a
combination of these ?

Thanks,

Thomas
Danomi Manchego May 14, 2018, 2:01 a.m. UTC | #3
Thomas,

On Sun, May 13, 2018 at 5:22 PM, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
> Hello,
>
> On Sun,  6 May 2018 15:04:02 -0400, Danomi Manchego wrote:
>> Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct
>> so that the list of licenses is presented as a comma-separated list.
>>
>> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
>
> I've applied to master, thanks! One comment below though.
>
>>  # 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 := $(GST1_PLUGINS_BAD_LICENSE), GPL
>
> It would be nice to make this vague "GPL" statement a bit clearer. Are
> we talking about GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+ ? Or a
> combination of these ?

You mentioned this before.  I took action in the second patch in this
series, http://lists.busybox.net/pipermail/buildroot/2018-May/220939.html
.  In that patch, I updated which plugins were GPL, and changed "GPL"
to "GPL-2.0+".  As Yann mentioned, I have some proof-reading errors in
the commit log, so I'll submit a new rev of that second patch.

Danomi -


> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com
Thomas Petazzoni May 14, 2018, 6:10 a.m. UTC | #4
Hello,

On Sun, 13 May 2018 22:01:18 -0400, Danomi Manchego wrote:

> > It would be nice to make this vague "GPL" statement a bit clearer. Are
> > we talking about GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+ ? Or a
> > combination of these ?  
> 
> You mentioned this before.  I took action in the second patch in this
> series, http://lists.busybox.net/pipermail/buildroot/2018-May/220939.html
> .  In that patch, I updated which plugins were GPL, and changed "GPL"
> to "GPL-2.0+".

Ah, sorry, didn't look at your second patch yet :-/

>  As Yann mentioned, I have some proof-reading errors in
> the commit log, so I'll submit a new rev of that second patch.

Yes, I've seen the v2, will have a look. Thanks a lot!

Thomas
Peter Korsgaard May 24, 2018, 9:02 p.m. UTC | #5
>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> writes:

 > Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct
 > so that the list of licenses is presented as a comma-separated list.

 > Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

Committed to 2018.02.x, thanks.
diff mbox series

Patch

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 9f7cd97..b001c33 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -11,7 +11,7 @@  GST1_PLUGINS_BAD_INSTALL_STAGING = YES
 # 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_LICENSE := LGPL-2.0+, LGPL-2.1+
 
 GST1_PLUGINS_BAD_CONF_OPTS = \
 	--disable-examples \
@@ -771,13 +771,13 @@  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 := $(GST1_PLUGINS_BAD_LICENSE), GPL
 GST1_PLUGINS_BAD_LICENSE_FILES += COPYING
 endif
 
 # Add Unknown license if Unknown licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y)
-GST1_PLUGINS_BAD_LICENSE += UNKNOWN
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN
 endif
 
 # Use the following command to extract license info for plugins.