[PATCH] recipes-core/busybox: fixup licensing information

[PATCH] recipes-core/busybox: fixup licensing information

[Yann E. MORIN]

Commit 7d32417b4d (busybox: Correct the name of the bzip2 license)
changes the licesne from 'bzip2' to 'bzip2-1.0.6' on the rationale
that the 'bzip2 license was renamed from "bzip2" to "bzip2-1.0.6"
[...] to match the official SPDX identifier.'

Though the above is true for the bzip2 and pbzip2 packages, the bzip2
code bundled in busybox is a copy from the bzip2 1.0.4 version, not the
1.0.6 version.

As such, using bzip2-1.0.6 is wrong.

Unfortunately, there is no official SPDX license identifier for this
bzip2 1.0.4 version, so we just mimick the existing ones (bzip2-1.0.5
and bzip2-1.0.6) by using bzip2-1.0.4.

Also, there is a license file attached to that, so we add it to the
list.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Alexandre BELLONI <alexandre.belloni@bootlin.com>

---
Respin, as I was not yet subscribed to the list...
Sorry for any duplicates...
---
 meta/recipes-core/busybox/busybox.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 45aaa2b41c..e0522be729 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -5,10 +5,11 @@ BUGTRACKER = "https://bugs.busybox.net/"
 
 DEPENDS += "kern-tools-native virtual/crypt"
 
-# bzip2 applet in busybox is based on lightly-modified bzip2 source
+# bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4 source
 # the GPL is version 2 only
-LICENSE = "GPLv2 & bzip2-1.0.6"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb"
+LICENSE = "GPLv2 & bzip2-1.0.4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \
+                    file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
 
 SECTION = "base"
 
-- 
2.25.1

Re: [OE-core] [PATCH] recipes-core/busybox: fixup licensing information

[Khem Raj]

On 10/27/20 9:48 AM, Yann E. MORIN wrote:
> Commit 7d32417b4d (busybox: Correct the name of the bzip2 license)
> changes the licesne from 'bzip2' to 'bzip2-1.0.6' on the rationale
> that the 'bzip2 license was renamed from "bzip2" to "bzip2-1.0.6"
> [...] to match the official SPDX identifier.'
> 
> Though the above is true for the bzip2 and pbzip2 packages, the bzip2
> code bundled in busybox is a copy from the bzip2 1.0.4 version, not the
> 1.0.6 version.
> 
> As such, using bzip2-1.0.6 is wrong.
> 
> Unfortunately, there is no official SPDX license identifier for this
> bzip2 1.0.4 version, so we just mimick the existing ones (bzip2-1.0.5
> and bzip2-1.0.6) by using bzip2-1.0.4.
> 
> Also, there is a license file attached to that, so we add it to the
> list.
> 

we also need a text file for this license in meta/files/common-licenses 
perhaps a symlink to bzip2-1.0.6 might be ok.

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> Cc: Alexandre BELLONI <alexandre.belloni@bootlin.com>
> 
> ---
> Respin, as I was not yet subscribed to the list...
> Sorry for any duplicates...
> ---
>   meta/recipes-core/busybox/busybox.inc | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> index 45aaa2b41c..e0522be729 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -5,10 +5,11 @@ BUGTRACKER = "https://bugs.busybox.net/"
>   
>   DEPENDS += "kern-tools-native virtual/crypt"
>   
> -# bzip2 applet in busybox is based on lightly-modified bzip2 source
> +# bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4 source
>   # the GPL is version 2 only
> -LICENSE = "GPLv2 & bzip2-1.0.6"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb"
> +LICENSE = "GPLv2 & bzip2-1.0.4"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \
> +                    file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
>   
>   SECTION = "base"
>   
> 
> 
> 
> 
> 

Re: [OE-core] [PATCH] recipes-core/busybox: fixup licensing information

[Yann E. MORIN]

Khem, All,

Thanks for the feedback; see more questions below...

On 2020-10-27 13:25 -0700, Khem Raj spake thusly:
> On 10/27/20 9:48 AM, Yann E. MORIN wrote:
> >Commit 7d32417b4d (busybox: Correct the name of the bzip2 license)
> >changes the licesne from 'bzip2' to 'bzip2-1.0.6' on the rationale
> >that the 'bzip2 license was renamed from "bzip2" to "bzip2-1.0.6"
> >[...] to match the official SPDX identifier.'
> >
> >Though the above is true for the bzip2 and pbzip2 packages, the bzip2
> >code bundled in busybox is a copy from the bzip2 1.0.4 version, not the
> >1.0.6 version.
> >
> >As such, using bzip2-1.0.6 is wrong.
> >
> >Unfortunately, there is no official SPDX license identifier for this
> >bzip2 1.0.4 version, so we just mimick the existing ones (bzip2-1.0.5
> >and bzip2-1.0.6) by using bzip2-1.0.4.
> >
> >Also, there is a license file attached to that, so we add it to the
> >list.
> >
> we also need a text file for this license in meta/files/common-licenses

Should this be the official LICENSE file from the upstream bzip2-1.0.4
version, or should that be the LICENSE file carried by busybox?

Note that the LICENSE file carried by busybox is slightly different than
the upstream one:

  - The bzip2 LICENSE file in busybox has a blurb added at the beginning:
        bzip2 applet in busybox is based on lightly-modified source
        of bzip2 version 1.0.4. bzip2 source is distributed
        under the following conditions (copied verbatim from LICENSE file)
    However this is wrong, because:

  - the bzip2 LICENSE file in busybox dropped the trailing spaces at the
    end of a few lines.

But techincally, this is tecnically the same license.

> perhaps a symlink to bzip2-1.0.6 might be ok.

The bzip2-1.0.4 license is not exactly the same as the 1.0.6. The deltas
are:

  - copyright year
  - author identification (physical address dropped)
  - release version
  - release date

So I don't think a symlink would be appropriate, and a specific file
will be needed.

So, which one should I add: the upstream one, of the busybox one?

Regards,
Yann E. MORIN.

> >Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> >Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> >Cc: Alexandre BELLONI <alexandre.belloni@bootlin.com>
> >
> >---
> >Respin, as I was not yet subscribed to the list...
> >Sorry for any duplicates...
> >---
> >  meta/recipes-core/busybox/busybox.inc | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> >diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> >index 45aaa2b41c..e0522be729 100644
> >--- a/meta/recipes-core/busybox/busybox.inc
> >+++ b/meta/recipes-core/busybox/busybox.inc
> >@@ -5,10 +5,11 @@ BUGTRACKER = "https://bugs.busybox.net/"
> >  DEPENDS += "kern-tools-native virtual/crypt"
> >-# bzip2 applet in busybox is based on lightly-modified bzip2 source
> >+# bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4 source
> >  # the GPL is version 2 only
> >-LICENSE = "GPLv2 & bzip2-1.0.6"
> >-LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb"
> >+LICENSE = "GPLv2 & bzip2-1.0.4"
> >+LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \
> >+                    file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
> >  SECTION = "base"
> >
> >
> >
> >
> >

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Re: [OE-core] [PATCH] recipes-core/busybox: fixup licensing information

[Peter Kjellerstedt]

> -----Original Message-----
> From: Yann E. MORIN <yann.morin.1998@free.fr>
> Sent: den 27 oktober 2020 21:51
> To: Khem Raj <raj.khem@gmail.com>
> Cc: openembedded-core@lists.openembedded.org; Peter Kjellerstedt
> <peter.kjellerstedt@axis.com>; Richard Purdie
> <richard.purdie@linuxfoundation.org>; Alexandre BELLONI
> <alexandre.belloni@bootlin.com>
> Subject: Re: [OE-core] [PATCH] recipes-core/busybox: fixup licensing
> information
> 
> Khem, All,
> 
> Thanks for the feedback; see more questions below...
> 
> On 2020-10-27 13:25 -0700, Khem Raj spake thusly:
> > On 10/27/20 9:48 AM, Yann E. MORIN wrote:
> > >Commit 7d32417b4d (busybox: Correct the name of the bzip2 license)
> > >changes the licesne from 'bzip2' to 'bzip2-1.0.6' on the rationale
> > >that the 'bzip2 license was renamed from "bzip2" to "bzip2-1.0.6"
> > >[...] to match the official SPDX identifier.'
> > >
> > >Though the above is true for the bzip2 and pbzip2 packages, the bzip2
> > >code bundled in busybox is a copy from the bzip2 1.0.4 version, not
> the
> > >1.0.6 version.
> > >
> > >As such, using bzip2-1.0.6 is wrong.
> > >
> > >Unfortunately, there is no official SPDX license identifier for this
> > >bzip2 1.0.4 version, so we just mimick the existing ones (bzip2-1.0.5
> > >and bzip2-1.0.6) by using bzip2-1.0.4.
> > >
> > >Also, there is a license file attached to that, so we add it to the
> > >list.
> > >
> > we also need a text file for this license in meta/files/common-licenses
> 
> Should this be the official LICENSE file from the upstream bzip2-1.0.4
> version, or should that be the LICENSE file carried by busybox?
> 
> Note that the LICENSE file carried by busybox is slightly different than
> the upstream one:
> 
>   - The bzip2 LICENSE file in busybox has a blurb added at the beginning:
>         bzip2 applet in busybox is based on lightly-modified source
>         of bzip2 version 1.0.4. bzip2 source is distributed
>         under the following conditions (copied verbatim from LICENSE
> file)
>     However this is wrong, because:
> 
>   - the bzip2 LICENSE file in busybox dropped the trailing spaces at the
>     end of a few lines.
> 
> But techincally, this is tecnically the same license.
> 
> > perhaps a symlink to bzip2-1.0.6 might be ok.
> 
> The bzip2-1.0.4 license is not exactly the same as the 1.0.6. The deltas
> are:
> 
>   - copyright year
>   - author identification (physical address dropped)
>   - release version
>   - release date
> 
> So I don't think a symlink would be appropriate, and a specific file
> will be needed.
> 
> So, which one should I add: the upstream one, of the busybox one?

I would go with the upstream one as the extra information in the 
Busybox file relates to Busybox' use of the code. However, I also
believe that "archival/libarchive/bz/LICENSE" should be added to 
LIC_FILES_CHKSUM.

> Regards,
> Yann E. MORIN.
> 
> > >Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > >Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > >Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> > >Cc: Alexandre BELLONI <alexandre.belloni@bootlin.com>
> > >
> > >---
> > >Respin, as I was not yet subscribed to the list...
> > >Sorry for any duplicates...
> > >---
> > >  meta/recipes-core/busybox/busybox.inc | 7 ++++---
> > >  1 file changed, 4 insertions(+), 3 deletions(-)
> > >
> > >diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-
> core/busybox/busybox.inc
> > >index 45aaa2b41c..e0522be729 100644
> > >--- a/meta/recipes-core/busybox/busybox.inc
> > >+++ b/meta/recipes-core/busybox/busybox.inc
> > >@@ -5,10 +5,11 @@ BUGTRACKER = "https://bugs.busybox.net/"
> > >  DEPENDS += "kern-tools-native virtual/crypt"
> > >-# bzip2 applet in busybox is based on lightly-modified bzip2 source
> > >+# bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4
> source
> > >  # the GPL is version 2 only
> > >-LICENSE = "GPLv2 & bzip2-1.0.6"
> > >-LIC_FILES_CHKSUM =
> "file://LICENSE;md5=de10de48642ab74318e893a61105afbb"
> > >+LICENSE = "GPLv2 & bzip2-1.0.4"
> > >+LIC_FILES_CHKSUM =
> "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \
> > >+
> file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383da
> e"
> > >  SECTION = "base"
> > >
> > >
> > >
> > >
> > >
> 
> --
> .-----------------.--------------------.------------------.--------------
> ------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
> |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There
> is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
> conspiracy.  |
> '------------------------------^-------^------------------^--------------
> ------'