diff mbox series

[12/77] man-pages: upgrade 6.01 -> 6.02

Message ID 20230104110548.2537259-12-alex@linutronix.de
State New
Headers show
Series [01/77] glib-2.0: upgrade 2.74.3 -> 2.74.4 | expand

Commit Message

Alexander Kanavin Jan. 4, 2023, 11:04 a.m. UTC
License-Update: readme rewritten, set of licenses provided explicitly.

Of those, there's various bsd flavours, gpl2-and-later and gpl-2-only, so add the
latter.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../man-pages/{man-pages_6.01.bb => man-pages_6.02.bb}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_6.01.bb => man-pages_6.02.bb} (83%)

Comments

Richard Purdie Jan. 6, 2023, 12:05 p.m. UTC | #1
On Wed, 2023-01-04 at 12:04 +0100, Alexander Kanavin wrote:
> License-Update: readme rewritten, set of licenses provided explicitly.
> 
> Of those, there's various bsd flavours, gpl2-and-later and gpl-2-only, so add the
> latter.

That does mean I have to ask whether the BSD licenses are missing from
LICENSE and should be added too?

Cheers,

Richard


> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../man-pages/{man-pages_6.01.bb => man-pages_6.02.bb}      | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-extended/man-pages/{man-pages_6.01.bb => man-pages_6.02.bb} (83%)
> 
> diff --git a/meta/recipes-extended/man-pages/man-pages_6.01.bb b/meta/recipes-extended/man-pages/man-pages_6.02.bb
> similarity index 83%
> rename from meta/recipes-extended/man-pages/man-pages_6.01.bb
> rename to meta/recipes-extended/man-pages/man-pages_6.02.bb
> index 1ad4ed1317..2e574e1de4 100644
> --- a/meta/recipes-extended/man-pages/man-pages_6.01.bb
> +++ b/meta/recipes-extended/man-pages/man-pages_6.02.bb
> @@ -2,12 +2,12 @@ SUMMARY = "Linux man-pages"
>  DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs"
>  SECTION = "console/utils"
>  HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
> -LICENSE = "GPL-2.0-or-later"
> +LICENSE = "GPL-2.0-or-later & GPL-2.0-only"
>  
> -LIC_FILES_CHKSUM = "file://README;md5=bf1faa9b0245e39a7c0c9690ffdf6e54"
> +LIC_FILES_CHKSUM = "file://README;md5=26901408d8cfd6f6675f8b49daf9cc74"
>  SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
>  
> -SRC_URI[sha256sum] = "c1e8bea88589f1a80b67dafd82fb98b018ddd7f7bfa594f8f79686258d26e784"
> +SRC_URI[sha256sum] = "968def9e7055c9cbca9a4f21f79677b02ac8b0d2fa62ceea7bd8ef4dcc6cac41"
>  
>  inherit manpages
>  
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#175398): https://lists.openembedded.org/g/openembedded-core/message/175398
> Mute This Topic: https://lists.openembedded.org/mt/96047880/1686473
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [richard.purdie@linuxfoundation.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexander Kanavin Jan. 6, 2023, 12:47 p.m. UTC | #2
On Fri 6. Jan 2023 at 13.05, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Wed, 2023-01-04 at 12:04 +0100, Alexander Kanavin wrote:
> > License-Update: readme rewritten, set of licenses provided explicitly.
> >
> > Of those, there's various bsd flavours, gpl2-and-later and gpl-2-only,
> so add the
> > latter.
>
> That does mean I have to ask whether the BSD licenses are missing from
> LICENSE and should be added too?


They should, yes. I’ll resend. The idea was that gpl + bsd = gpl, but not
when pieces are individually installed.

Alex



>
> Cheers,
>
> Richard
>
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  .../man-pages/{man-pages_6.01.bb => man-pages_6.02.bb}      | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >  rename meta/recipes-extended/man-pages/{man-pages_6.01.bb =>
> man-pages_6.02.bb} (83%)
> >
> > diff --git a/meta/recipes-extended/man-pages/man-pages_6.01.bb
> b/meta/recipes-extended/man-pages/man-pages_6.02.bb
> > similarity index 83%
> > rename from meta/recipes-extended/man-pages/man-pages_6.01.bb
> > rename to meta/recipes-extended/man-pages/man-pages_6.02.bb
> > index 1ad4ed1317..2e574e1de4 100644
> > --- a/meta/recipes-extended/man-pages/man-pages_6.01.bb
> > +++ b/meta/recipes-extended/man-pages/man-pages_6.02.bb
> > @@ -2,12 +2,12 @@ SUMMARY = "Linux man-pages"
> >  DESCRIPTION = "The Linux man-pages project documents the Linux kernel
> and C library interfaces that are employed by user programs"
> >  SECTION = "console/utils"
> >  HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
> > -LICENSE = "GPL-2.0-or-later"
> > +LICENSE = "GPL-2.0-or-later & GPL-2.0-only"
> >
> > -LIC_FILES_CHKSUM = "file://README;md5=bf1faa9b0245e39a7c0c9690ffdf6e54"
> > +LIC_FILES_CHKSUM = "file://README;md5=26901408d8cfd6f6675f8b49daf9cc74"
> >  SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
> >
> > -SRC_URI[sha256sum] =
> "c1e8bea88589f1a80b67dafd82fb98b018ddd7f7bfa594f8f79686258d26e784"
> > +SRC_URI[sha256sum] =
> "968def9e7055c9cbca9a4f21f79677b02ac8b0d2fa62ceea7bd8ef4dcc6cac41"
> >
> >  inherit manpages
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#175398):
> https://lists.openembedded.org/g/openembedded-core/message/175398
> > Mute This Topic: https://lists.openembedded.org/mt/96047880/1686473
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> richard.purdie@linuxfoundation.org]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
diff mbox series

Patch

diff --git a/meta/recipes-extended/man-pages/man-pages_6.01.bb b/meta/recipes-extended/man-pages/man-pages_6.02.bb
similarity index 83%
rename from meta/recipes-extended/man-pages/man-pages_6.01.bb
rename to meta/recipes-extended/man-pages/man-pages_6.02.bb
index 1ad4ed1317..2e574e1de4 100644
--- a/meta/recipes-extended/man-pages/man-pages_6.01.bb
+++ b/meta/recipes-extended/man-pages/man-pages_6.02.bb
@@ -2,12 +2,12 @@  SUMMARY = "Linux man-pages"
 DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs"
 SECTION = "console/utils"
 HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-or-later & GPL-2.0-only"
 
-LIC_FILES_CHKSUM = "file://README;md5=bf1faa9b0245e39a7c0c9690ffdf6e54"
+LIC_FILES_CHKSUM = "file://README;md5=26901408d8cfd6f6675f8b49daf9cc74"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
 
-SRC_URI[sha256sum] = "c1e8bea88589f1a80b67dafd82fb98b018ddd7f7bfa594f8f79686258d26e784"
+SRC_URI[sha256sum] = "968def9e7055c9cbca9a4f21f79677b02ac8b0d2fa62ceea7bd8ef4dcc6cac41"
 
 inherit manpages