[Buildroot] [PATCH 1/5] ffmpeg: define license

[Buildroot] [PATCH 1/5] ffmpeg: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---

This patch defines the license in a very simple way.

How about making it more "automagic", such as:

ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license
FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2
else
FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
endif

---

 package/multimedia/ffmpeg/ffmpeg.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b018ea0..ea43eeb 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -8,6 +8,8 @@ FFMPEG_VERSION = 0.8.12
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
+FFMPEG_LICENSE = LGPLv2.1+, GPLv2+ (optional components), libjpeg license
+FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2
 
 FFMPEG_CONF_OPT = \
 	--prefix=/usr		\
-- 
1.7.10.4

[Buildroot] [PATCH 2/5] omap-u-boot-utils: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/omap-u-boot-utils/omap-u-boot-utils.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index bb894a5..8615fdb 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -6,6 +6,8 @@
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852
 OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/master
+OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
+OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 
 define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)
-- 
1.7.10.4

[Buildroot] [PATCH 3/5] qt: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/qt/qt.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ee1a88b..06237ef 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -16,6 +16,8 @@ QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://releases.qt-project.org/qt4/source
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial
+QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
 
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
 QT_CONFIGURE_OPTS += -opensource -confirm-license
-- 
1.7.10.4

[Buildroot] [PATCH 4/5] fbset: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/fbset/fbset.mk |    1 +
 1 file changed, 1 insertion(+)

diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 3423259..85d97d5 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -7,6 +7,7 @@
 FBSET_VERSION = 2.1
 FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
+FBSET_LICENSE = GPL
 
 # Make sure full fbset wins over busybox fbset
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-- 
1.7.10.4

[Buildroot] [PATCH 5/5] ccache: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/ccache/ccache.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 1cbad6e..faa7c9f 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -7,6 +7,8 @@
 CCACHE_VERSION = 3.1.8
 CCACHE_SITE    = http://samba.org/ftp/ccache
 CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
+CCACHE_LICENSE = GPLv3+, others
+CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
 # When ccache is being built for the host, ccache is not yet
 # available, so we have to use the special C compiler without the
-- 
1.7.10.4

[Buildroot] [PATCH 3/5] qt: define license

[Thomas Petazzoni]

Dear Luca Ceresoli,

On Wed,  6 Feb 2013 17:24:11 +0100, Luca Ceresoli wrote:

> +QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial
> +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3

If Qt5, I've done:

+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
+QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0
+QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+else
+QT5BASE_LICENSE = Commercial license
+QT5BASE_REDISTRIBUTE = NO
+endif

See
http://git.free-electrons.com/users/thomas-petazzoni/buildroot/commit/?h=qt5&id=7c1f7b9967d814e3f5c838e7090ac04b9d06af51

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 3/5] qt: define license

[Arnout Vandecappelle]

On 06/02/13 17:58, Thomas Petazzoni wrote:
> Dear Luca Ceresoli,
>
> On Wed,  6 Feb 2013 17:24:11 +0100, Luca Ceresoli wrote:
>
>> +QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial
>> +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
>
> If Qt5, I've done:
>
> +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
> +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0

  Isn't it GPLv3 rather than GPLv3.0?

> +QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
> +else
> +QT5BASE_LICENSE = Commercial license
> +QT5BASE_REDISTRIBUTE = NO

  Hm. If LICENSE_APPROVED is not set, it means that the compilation will 
stop to ask the user which license s/he wants. That doesn't necessarily 
imply the commercial license. So I prefer an OR construct here as well.
And anyway, even if you hold a commercial license you're still free to 
distribute it under one of the other licenses.

  By the way, I'd also call it "Digia Qt Commercial license" to make it 
more explicit. But that's just an opinion.


  Regards,
  Arnout

> +endif
>
> See
> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/commit/?h=qt5&id=7c1f7b9967d814e3f5c838e7090ac04b9d06af51
>
> Best regards,
>
> Thomas
>


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/5] ffmpeg: define license

[Arnout Vandecappelle]

On 06/02/13 17:24, Luca Ceresoli wrote:
> How about making it more "automagic", such as:
>
> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
> FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license
> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2
> else
> FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
> endif

  Sounds good to me!

  Regards,
  Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/5] ffmpeg: define license

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 Arnout> On 06/02/13 17:24, Luca Ceresoli wrote:
 >> How about making it more "automagic", such as:
 >> 
 >> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 >> FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license
 >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2
 >> else
 >> FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
 >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
 >> endif

 Arnout>  Sounds good to me!

Or even better:

FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1

ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE += GPLv2+
FFMPEG_LICENSE += COPYING.GPLv2
endif

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/5] qt: define license

[Luca Ceresoli]

Arnout Vandecappelle wrote:
> On 06/02/13 17:58, Thomas Petazzoni wrote:
>> Dear Luca Ceresoli,
>>
>> On Wed,  6 Feb 2013 17:24:11 +0100, Luca Ceresoli wrote:
>>
>>> +QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial
>>> +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
>>
>> If Qt5, I've done:
>>
>> +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
>> +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
>> +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0
>
>   Isn't it GPLv3 rather than GPLv3.0?
>
>> +QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
>> +else
>> +QT5BASE_LICENSE = Commercial license
>> +QT5BASE_REDISTRIBUTE = NO
>
>   Hm. If LICENSE_APPROVED is not set, it means that the compilation will
> stop to ask the user which license s/he wants. That doesn't necessarily
> imply the commercial license. So I prefer an OR construct here as well.
> And anyway, even if you hold a commercial license you're still free to
> distribute it under one of the other licenses.

How about the following?

QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
ifneq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT_LICENSE += or Digia Qt Commercial license
endif
QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3

This way we still cannot automatically (and safely) set
_REDISTRIBUTE = NO, unless we add an explicit "Use commercial license"
knob in menuconfig.

Luca


>
>   By the way, I'd also call it "Digia Qt Commercial license" to make it
> more explicit. But that's just an opinion.

[Buildroot] [PATCH 1/5] ffmpeg: define license

[Luca Ceresoli]

Peter Korsgaard wrote:
>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
>
>   Arnout> On 06/02/13 17:24, Luca Ceresoli wrote:
>   >> How about making it more "automagic", such as:
>   >>
>   >> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
>   >> FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license
>   >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2
>   >> else
>   >> FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
>   >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
>   >> endif
>
>   Arnout>  Sounds good to me!
>
> Or even better:
>
> FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
>
> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
> FFMPEG_LICENSE += GPLv2+
> FFMPEG_LICENSE += COPYING.GPLv2
> endif
>

Fine, will do and resend.

Luca

[Buildroot] [PATCH 3/5] qt: define license

[Arnout Vandecappelle]

On 07/02/13 09:34, Luca Ceresoli wrote:
> Arnout Vandecappelle wrote:
>> On 06/02/13 17:58, Thomas Petazzoni wrote:
>>> Dear Luca Ceresoli,
>>>
>>> On Wed,  6 Feb 2013 17:24:11 +0100, Luca Ceresoli wrote:
>>>
>>>> +QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial
>>>> +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
>>>
>>> If Qt5, I've done:
>>>
>>> +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
>>> +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
>>> +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0
>>
>>   Isn't it GPLv3 rather than GPLv3.0?
>>
>>> +QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
>>> +else
>>> +QT5BASE_LICENSE = Commercial license
>>> +QT5BASE_REDISTRIBUTE = NO
>>
>>   Hm. If LICENSE_APPROVED is not set, it means that the compilation will
>> stop to ask the user which license s/he wants. That doesn't necessarily
>> imply the commercial license. So I prefer an OR construct here as well.
>> And anyway, even if you hold a commercial license you're still free to
>> distribute it under one of the other licenses.
>
> How about the following?
>
> QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
> ifneq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> QT_LICENSE += or Digia Qt Commercial license
> endif
> QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3

  Sounds good to me.


> This way we still cannot automatically (and safely) set
> _REDISTRIBUTE = NO, unless we add an explicit "Use commercial license"
> knob in menuconfig.

  I don't think that's very important.

  Regards,
  Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 4/5] fbset: define license

[Peter Korsgaard]

>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:

 Luca> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
 Luca> ---
 Luca>  package/fbset/fbset.mk |    1 +
 Luca>  1 file changed, 1 insertion(+)

 Luca> diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
 Luca> index 3423259..85d97d5 100644
 Luca> --- a/package/fbset/fbset.mk
 Luca> +++ b/package/fbset/fbset.mk
 Luca> @@ -7,6 +7,7 @@
 Luca>  FBSET_VERSION = 2.1
 Luca>  FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
 Luca>  FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
 Luca> +FBSET_LICENSE = GPL

It's not explicitly said, but considering how much it is linked to the
kernel fbdev interface and the references to COPYING in the Linux kernel
I think it should be GPLv2.

Committed with that fixed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/5] qt: define license

[Luca Ceresoli]

Arnout Vandecappelle wrote:
>> How about the following?
>>
>> QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
>> ifneq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
>> QT_LICENSE += or Digia Qt Commercial license
>> endif
>> QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
>
>   Sounds good to me.
>
>
>> This way we still cannot automatically (and safely) set
>> _REDISTRIBUTE = NO, unless we add an explicit "Use commercial license"
>> knob in menuconfig.
>
>   I don't think that's very important.

I agree. In fact I did not care about this in the v2 patch I just sent.

Luca