* [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license
@ 2018-04-12 3:02 Danomi Manchego
2018-05-03 20:36 ` Yann E. MORIN
2018-05-03 21:05 ` Thomas Petazzoni
0 siblings, 2 replies; 5+ messages in thread
From: Danomi Manchego @ 2018-04-12 3:02 UTC (permalink / raw)
To: 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 <danomimanchego123@gmail.com>
---
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.
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license
2018-04-12 3:02 [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license Danomi Manchego
@ 2018-05-03 20:36 ` Yann E. MORIN
2018-05-24 21:02 ` Peter Korsgaard
2018-05-03 21:05 ` Thomas Petazzoni
1 sibling, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2018-05-03 20:36 UTC (permalink / raw)
To: buildroot
Danomi, All,
On 2018-04-11 23:02 -0400, Danomi Manchego spake thusly:
> 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 <danomimanchego123@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
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.
> --
> 2.7.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license
2018-04-12 3:02 [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license Danomi Manchego
2018-05-03 20:36 ` Yann E. MORIN
@ 2018-05-03 21:05 ` Thomas Petazzoni
2018-05-06 19:03 ` Danomi Manchego
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2018-05-03 21:05 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 11 Apr 2018 23:02:10 -0400, Danomi Manchego wrote:
> 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 <danomimanchego123@gmail.com>
I've applied to master, thanks. However, there's a separate but related
issue. See below.
> ---
> 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
This way of appending to the LICENSE variable is not very good, because
the value will then be:
LGPL-2.0+, LGPL-2.1+ GPL
which isn't very good. We should instead do:
GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL
and actually, "GPL" by itself doesn't mean much, it should be GPL-2.0
or GPL-3.0.
Would you mind looking into fixing those remaining issues ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license
2018-05-03 21:05 ` Thomas Petazzoni
@ 2018-05-06 19:03 ` Danomi Manchego
0 siblings, 0 replies; 5+ messages in thread
From: Danomi Manchego @ 2018-05-06 19:03 UTC (permalink / raw)
To: buildroot
Thomas,
On Thu, May 3, 2018 at 5:05 PM, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
> Hello,
>
> On Wed, 11 Apr 2018 23:02:10 -0400, Danomi Manchego wrote:
>> 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 <danomimanchego123@gmail.com>
>
> I've applied to master, thanks. However, there's a separate but related
> issue. See below.
>
>> ---
>> 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
>
> This way of appending to the LICENSE variable is not very good, because
> the value will then be:
>
> LGPL-2.0+, LGPL-2.1+ GPL
>
> which isn't very good. We should instead do:
>
> GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL
>
> and actually, "GPL" by itself doesn't mean much, it should be GPL-2.0
> or GPL-3.0.
>
> Would you mind looking into fixing those remaining issues ?
Okay, I'll send in a couple patches.
Danomi -
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license
2018-05-03 20:36 ` Yann E. MORIN
@ 2018-05-24 21:02 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-05-24 21:02 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> Danomi, All,
> On 2018-04-11 23:02 -0400, Danomi Manchego spake thusly:
>> 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 <danomimanchego123@gmail.com>
Committed to 2018.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-24 21:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-12 3:02 [Buildroot] [PATCH 1/1] gst1-plugins-bad: conditionally add gpl license Danomi Manchego
2018-05-03 20:36 ` Yann E. MORIN
2018-05-24 21:02 ` Peter Korsgaard
2018-05-03 21:05 ` Thomas Petazzoni
2018-05-06 19:03 ` Danomi Manchego
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.