Skip to contentSkip to conversation

gst1-plugins-bad: conditionally add gpl license

PATCH New Danomi Manchego 4 participants 5 messages Apr 12, 2018 – May 24, 2018

lore
Share & tools
lore

Danomi Manchego

author
#0 lore raw

PATCH 1/1 gst1-plugins-bad: conditionally add gpl license

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 <[email protected]>
---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +4 -3
index 83cb94b..9f7cd97 100644
@@ -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.
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 gst1-plugins-bad: conditionally add gpl license

Danomi, All,

On 2018-04-11 23:02 -0400, Danomi Manchego spake thusly:

Quoted 9 lines

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 <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 36 lines
---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +4 -3
index 83cb94b..9f7cd97 100644
@@ -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.
Signature · 6 lines
2.7.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 gst1-plugins-bad: conditionally add gpl license

Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Danomi, All,
On 2018-04-11 23:02 -0400, Danomi Manchego spake thusly:

Quoted 9 lines

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 <[email protected]>

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
Applied
#3 lore raw

PATCH 1/1 gst1-plugins-bad: conditionally add gpl license

In reply to Danomi Manchego

Hello,

Quoted 9 lines · Danomi Manchego

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 <[email protected]>

I've applied to master, thanks. However, there's a separate but related issue. See below.

Quoted 22 lines
---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +3 -3
index 83cb94b..9f7cd97 100644
@@ -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 = \

package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk endif · line 774

Quoted 3 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0 -0
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#4 lore raw

PATCH 1/1 gst1-plugins-bad: conditionally add gpl license

Thomas,

Quoted 47 lines · Thomas Petazzoni

Hello,

Quoted 9 lines · Danomi Manchego

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 <[email protected]>

I've applied to master, thanks. However, there's a separate but related issue. See below.

Quoted 22 lines
---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +3 -3
index 83cb94b..9f7cd97 100644
@@ -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 = \

package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk endif · line 774

Quoted 3 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0 -0
@@ -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
Quoted 8 lines

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 -

Quoted 7 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering
https://bootlin.com