[Buildroot] [PATCH 1/6] dbus-glib: fix legal info

[Buildroot] [PATCH 1/6] dbus-glib: fix legal info

[Rahul Bedarkar]

dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+.
Separate licenses using 'or' keyword.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/dbus-glib/dbus-glib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 4a1e4b4..5a6f5a0 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -7,7 +7,7 @@
 DBUS_GLIB_VERSION = 0.108
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib
 DBUS_GLIB_INSTALL_STAGING = YES
-DBUS_GLIB_LICENSE = AFLv2.1, GPLv2+
+DBUS_GLIB_LICENSE = AFLv2.1 or GPLv2+
 DBUS_GLIB_LICENSE_FILES = COPYING
 
 DBUS_GLIB_CONF_ENV = \
-- 
2.6.2

[Buildroot] [PATCH 2/6] dbus-triggerd: add license file

[Rahul Bedarkar]

In absence of license file, use source file as a license file since it
has license header in comments.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/dbus-triggerd/dbus-triggerd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dbus-triggerd/dbus-triggerd.mk b/package/dbus-triggerd/dbus-triggerd.mk
index 48d5fb2..0d693b4 100644
--- a/package/dbus-triggerd/dbus-triggerd.mk
+++ b/package/dbus-triggerd/dbus-triggerd.mk
@@ -7,6 +7,7 @@
 DBUS_TRIGGERD_VERSION = ba3dbec805cb707c94c54de21666bf18b79bcc09
 DBUS_TRIGGERD_SITE = git://rg42.org/dbustriggerd.git
 DBUS_TRIGGERD_LICENSE = GPLv2+
+DBUS_TRIGGERD_LICENSE_FILES = dbus-triggerd.c
 DBUS_TRIGGERD_DEPENDENCIES = host-pkgconf dbus
 
 define DBUS_TRIGGERD_BUILD_CMDS
-- 
2.6.2

[Buildroot] [PATCH 2/6] dbus-triggerd: add license file

[Peter Korsgaard]

>>>>> "Rahul" == Rahul Bedarkar <rahul.bedarkar@imgtec.com> writes:

 > In absence of license file, use source file as a license file since it
 > has license header in comments.

 > Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>


Committed to 2017.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/6] taglib: fix legal info

[Rahul Bedarkar]

taglib is dual licensed under LGPLv2.1 or MPLv1.1. Almost all source
files have license text mentioning LGPLv2.1 or alternatively MPLv1.1.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/taglib/taglib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index f47c4ba..0f65a30 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -7,7 +7,7 @@
 TAGLIB_VERSION = 1.11.1
 TAGLIB_SITE = http://taglib.github.io/releases
 TAGLIB_INSTALL_STAGING = YES
-TAGLIB_LICENSE = LGPLv2.1, MPL
+TAGLIB_LICENSE = LGPLv2.1 or MPLv1.1
 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-- 
2.6.2

[Buildroot] [PATCH 3/6] taglib: fix legal info

[Peter Korsgaard]

>>>>> "Rahul" == Rahul Bedarkar <rahul.bedarkar@imgtec.com> writes:

 > taglib is dual licensed under LGPLv2.1 or MPLv1.1. Almost all source
 > files have license text mentioning LGPLv2.1 or alternatively MPLv1.1.

 > Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>

Committed to 2017.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Rahul Bedarkar]

For MPL version 2.0, we use MPLv2.0 as license abbreviation.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/python-mwscrape/python-mwscrape.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-mwscrape/python-mwscrape.mk b/package/python-mwscrape/python-mwscrape.mk
index 47b943f..5054675 100644
--- a/package/python-mwscrape/python-mwscrape.mk
+++ b/package/python-mwscrape/python-mwscrape.mk
@@ -6,7 +6,7 @@
 
 PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6
 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
-PYTHON_MWSCRAPE_LICENSE = MPL-2.0
+PYTHON_MWSCRAPE_LICENSE = MPLv2.0
 PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt
 PYTHON_MWSCRAPE_SETUP_TYPE = distutils
 
-- 
2.6.2

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Thomas Petazzoni]

Hello,

On Wed, 22 Mar 2017 23:18:53 +0530, Rahul Bedarkar wrote:

>  PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6
>  PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
> -PYTHON_MWSCRAPE_LICENSE = MPL-2.0
> +PYTHON_MWSCRAPE_LICENSE = MPLv2.0

Well, our idea was to use the SPDX license codes as much as possible,
and MPL-2.0 is the correct SPDX license code for this license. However,
it is true we haven't used SPDX from the beginning, so we're using
GPLv2 everywhere, while SPDX uses GPL-2.0.

See:

  https://spdx.org/licenses/

I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all
other licenses, use the SPDX code as much as possible.

Maybe we should bite the bullet, and migrate all packages to use SPDX
license codes?

Arnout, Yann, Peter?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Yann E. MORIN]

Thomas, All,

On 2017-03-22 21:39 +0100, Thomas Petazzoni spake thusly:
> On Wed, 22 Mar 2017 23:18:53 +0530, Rahul Bedarkar wrote:
> 
> >  PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6
> >  PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
> > -PYTHON_MWSCRAPE_LICENSE = MPL-2.0
> > +PYTHON_MWSCRAPE_LICENSE = MPLv2.0
> 
> Well, our idea was to use the SPDX license codes as much as possible,
> and MPL-2.0 is the correct SPDX license code for this license. However,
> it is true we haven't used SPDX from the beginning, so we're using
> GPLv2 everywhere, while SPDX uses GPL-2.0.
> 
> See:
> 
>   https://spdx.org/licenses/
> 
> I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all
> other licenses, use the SPDX code as much as possible.
> 
> Maybe we should bite the bullet, and migrate all packages to use SPDX
> license codes?

That would have my approval, yes.

Regards,
Yann E. MORIN.

> Arnout, Yann, Peter?
> 
> Best regards,
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Arnout Vandecappelle]

On 22-03-17 23:32, Yann E. MORIN wrote:
> Thomas, All,
> 
> On 2017-03-22 21:39 +0100, Thomas Petazzoni spake thusly:
>> On Wed, 22 Mar 2017 23:18:53 +0530, Rahul Bedarkar wrote:
>>
>>>  PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6
>>>  PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
>>> -PYTHON_MWSCRAPE_LICENSE = MPL-2.0
>>> +PYTHON_MWSCRAPE_LICENSE = MPLv2.0
>>
>> Well, our idea was to use the SPDX license codes as much as possible,
>> and MPL-2.0 is the correct SPDX license code for this license. However,
>> it is true we haven't used SPDX from the beginning, so we're using
>> GPLv2 everywhere, while SPDX uses GPL-2.0.
>>
>> See:
>>
>>   https://spdx.org/licenses/
>>
>> I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all
>> other licenses, use the SPDX code as much as possible.
>>
>> Maybe we should bite the bullet, and migrate all packages to use SPDX
>> license codes?
> 
> That would have my approval, yes.

 Indeed, I've been thinking about doing this.

 Now we just have to find a volunteer to construct the necessary sed magic :-)

 BTW I would propose to do this in one mega-patch that does mechanical
substitution in all the .mk files (make sure the commit log contains the
scriptlet that does it), and a second patch to fix the documentation. If it
makes things easier, the mega-patch could be split up into separate patches for
the different versions.

 Oh, and for the documentation update: perhaps we should remove the list of
licenses from our documentation, and instead refer only to spdx.org? I just
notice now: we currently don't refer to SPDX at all in the documentation! That
would explain Rahul's confusion about the proper license string...

 Oh, and scancpan and scanpypi have to be updated as well.

 Regards,
 Arnout

> 
> Regards,
> Yann E. MORIN.
> 
>> Arnout, Yann, Peter?
>>
>> Best regards,
>>
>> Thomas
>> -- 
>> Thomas Petazzoni, CTO, Free Electrons
>> Embedded Linux and Kernel engineering
>> http://free-electrons.com
> 

-- 
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:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Thomas Petazzoni]

Hello,

On Thu, 23 Mar 2017 09:25:11 +0100, Arnout Vandecappelle wrote:

> >> I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all
> >> other licenses, use the SPDX code as much as possible.
> >>
> >> Maybe we should bite the bullet, and migrate all packages to use SPDX
> >> license codes?  
> > 
> > That would have my approval, yes.  
> 
>  Indeed, I've been thinking about doing this.

OK, so let's just do it :)

The only thing that we might consider is the impact of this change for
our users. Are people parsing the CSV output, and checking if there is
no GPLv3 for example? Such checks would no longer match.

But longer term, I believe we will give our users a much more
logical/stable situation if we use SPDX codes everywhere rather than
the clunky mix we have today.

>  Now we just have to find a volunteer to construct the necessary sed magic :-)
> 
>  BTW I would propose to do this in one mega-patch that does mechanical
> substitution in all the .mk files (make sure the commit log contains the
> scriptlet that does it), and a second patch to fix the documentation. If it
> makes things easier, the mega-patch could be split up into separate patches for
> the different versions.

One patch for each license change would be nice IMO.

>  Oh, and for the documentation update: perhaps we should remove the list of
> licenses from our documentation, and instead refer only to spdx.org? I just
> notice now: we currently don't refer to SPDX at all in the documentation! That
> would explain Rahul's confusion about the proper license string...

Agreed.

>  Oh, and scancpan and scanpypi have to be updated as well.

Agreed.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Rahul Bedarkar]

Hello,

Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

> Hello,
> 
> On Thu, 23 Mar 2017 09:25:11 +0100, Arnout Vandecappelle wrote:
> 
> > >> I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all
> > >> other licenses, use the SPDX code as much as possible.
> > >>
> > >> Maybe we should bite the bullet, and migrate all packages to use SPDX
> > >> license codes?
> > >
> > > That would have my approval, yes.
> >
> >  Indeed, I've been thinking about doing this.
> 
> OK, so let's just do it :)

I can have a look. But I think I won't be able to post initial version until end of next
week because of my travel.

Thanks,
Rahul

[Buildroot] [PATCH 4/6] python-mwscrape: use documented license abbreviation

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Thu, 23 Mar 2017 09:25:11 +0100, Arnout Vandecappelle wrote:

 >> >> I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all
 >> >> other licenses, use the SPDX code as much as possible.
 >> >>
 >> >> Maybe we should bite the bullet, and migrate all packages to use SPDX
 >> >> license codes?  
 >> > 
 >> > That would have my approval, yes.  
 >> 
 >> Indeed, I've been thinking about doing this.

 > OK, so let's just do it :)

Agreed!

 > The only thing that we might consider is the impact of this change for
 > our users. Are people parsing the CSV output, and checking if there is
 > no GPLv3 for example? Such checks would no longer match.

I haven't heard about anybody doing that, but as long as we mention it
in the release notes I don't think it is a big issue.


 > But longer term, I believe we will give our users a much more
 > logical/stable situation if we use SPDX codes everywhere rather than
 > the clunky mix we have today.

Yes, me too!

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 5/6] python-certifi: use documented license abbreviation

[Rahul Bedarkar]

For MPL version 2.0, we use MPLv2.0 as license abbreviation.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/python-certifi/python-certifi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk
index 3f83194..cf9ebc2 100644
--- a/package/python-certifi/python-certifi.mk
+++ b/package/python-certifi/python-certifi.mk
@@ -8,7 +8,7 @@ PYTHON_CERTIFI_VERSION = 2017.1.23
 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz
 PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/b6/fa/ca682d5ace0700008d246664e50db8d095d23750bb212c0086305450c276
 PYTHON_CERTIFI_SETUP_TYPE = setuptools
-PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem)
+PYTHON_CERTIFI_LICENSE = ISC (Python code), MPLv2.0 (cacert.pem)
 PYTHON_CERTIFI_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
-- 
2.6.2

[Buildroot] [PATCH 6/6] perl-encode-detect: use documented license abbreviation

[Rahul Bedarkar]

For MPL version 1.1, we use MPLv1.1 as license abbreviation.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/perl-encode-detect/perl-encode-detect.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/perl-encode-detect/perl-encode-detect.mk b/package/perl-encode-detect/perl-encode-detect.mk
index 732fba8..692bd6b 100644
--- a/package/perl-encode-detect/perl-encode-detect.mk
+++ b/package/perl-encode-detect/perl-encode-detect.mk
@@ -8,7 +8,7 @@ PERL_ENCODE_DETECT_VERSION = 1.01
 PERL_ENCODE_DETECT_SOURCE = Encode-Detect-$(PERL_ENCODE_DETECT_VERSION).tar.gz
 PERL_ENCODE_DETECT_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JG/JGMYERS
 PERL_ENCODE_DETECT_DEPENDENCIES = host-perl-module-build
-PERL_ENCODE_DETECT_LICENSE = MPL-1.1
+PERL_ENCODE_DETECT_LICENSE = MPLv1.1
 PERL_ENCODE_DETECT_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
-- 
2.6.2

[Buildroot] [PATCH 1/6] dbus-glib: fix legal info

[Thomas Petazzoni]

Hello,

On Wed, 22 Mar 2017 23:18:50 +0530, Rahul Bedarkar wrote:
> dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+.
> Separate licenses using 'or' keyword.
> 
> Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
> ---
>  package/dbus-glib/dbus-glib.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Patches 1 to 3 applied. On PATCH 3, I've changed MPLv1.1 to MPL-1.1, to
match the SPDX license code.

As discussed previously, I've dropped patches 4 to 6, since we really
want to use the SPDX license codes.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/6] dbus-glib: fix legal info

[Peter Korsgaard]

>>>>> "Rahul" == Rahul Bedarkar <rahul.bedarkar@imgtec.com> writes:

 > dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+.
 > Separate licenses using 'or' keyword.

 > Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>

Committed to 2017.02.x, thanks.

-- 
Bye, Peter Korsgaard