Message ID | 20220331115131.1565450-1-richard.purdie@linuxfoundation.org |
---|---|
State | Accepted, archived |
Commit | d00628aac051cfc2ceffbc42f896a4672fdbcab1 |
Headers | show |
Series | [1/3] modutils-initscripts: Change license PD -> MIT | expand |
+1 on this. Much happier looking code. Ross On Thu, 31 Mar 2022 at 12:51, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > The file was originally added to OE here: > https://git.openembedded.org/openembedded/commit/modutils/files/modutils.sh?id=3b3989442075d0a4c6c32cb187de17d87bf65fbd > > and the license added here as "PD": > https://git.openembedded.org/openembedded/commit/modutils/modutils-initscripts.oe?id=4f7d2b1b63d166e5de146d71e5c942419424446e > > As "Public Domain", we can re-license it to MIT, which fits in with the rest of > our metadata and has an SPDX identifier, so lets do that and try and keep our > licenses simpler. > > This also them removes the need for a weird license patch in SRC_URI. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta/recipes-kernel/modutils-initscripts/files/PD.patch | 8 -------- > .../recipes-kernel/modutils-initscripts/files/modutils.sh | 4 ++++ > .../modutils-initscripts/modutils-initscripts.bb | 7 +++---- > 3 files changed, 7 insertions(+), 12 deletions(-) > delete mode 100644 meta/recipes-kernel/modutils-initscripts/files/PD.patch > > diff --git a/meta/recipes-kernel/modutils-initscripts/files/PD.patch b/meta/recipes-kernel/modutils-initscripts/files/PD.patch > deleted file mode 100644 > index 21ac49cbd8d..00000000000 > --- a/meta/recipes-kernel/modutils-initscripts/files/PD.patch > +++ /dev/null > @@ -1,8 +0,0 @@ > -Upstream-Status: Inappropriate [licensing] > - > -Index: modutils-initscripts-1.0/LICENSE > -=================================================================== > ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 > -+++ modutils-initscripts-1.0/LICENSE 2010-12-06 14:26:03.570339002 -0800 > -@@ -0,0 +1 @@ > -+Public Domain > diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh > index 67e1dcd9907..e9aaa66cb71 100755 > --- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh > +++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh > @@ -1,4 +1,8 @@ > #!/bin/sh > +# > +# SPDX-License-Identifier: MIT > +# > + > ### BEGIN INIT INFO > # Provides: module-init-tools > # Required-Start: > diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb > index aa71309126f..8f4fdd76bfb 100644 > --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb > +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb > @@ -1,9 +1,8 @@ > SUMMARY = "Initscript for auto-loading kernel modules on boot" > SECTION = "base" > -LICENSE = "PD" > -LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098" > -SRC_URI = "file://modutils.sh \ > - file://PD.patch" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://modutils.sh;beginline=3;endline=3;md5=b2dccaa94b3629a08bfb4f983cad6f89" > +SRC_URI = "file://modutils.sh" > > PR = "r7" > > -- > 2.32.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#163810): https://lists.openembedded.org/g/openembedded-core/message/163810 > Mute This Topic: https://lists.openembedded.org/mt/90152715/1676615 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross@burtonini.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-kernel/modutils-initscripts/files/PD.patch b/meta/recipes-kernel/modutils-initscripts/files/PD.patch deleted file mode 100644 index 21ac49cbd8d..00000000000 --- a/meta/recipes-kernel/modutils-initscripts/files/PD.patch +++ /dev/null @@ -1,8 +0,0 @@ -Upstream-Status: Inappropriate [licensing] - -Index: modutils-initscripts-1.0/LICENSE -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ modutils-initscripts-1.0/LICENSE 2010-12-06 14:26:03.570339002 -0800 -@@ -0,0 +1 @@ -+Public Domain diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index 67e1dcd9907..e9aaa66cb71 100755 --- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh +++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh @@ -1,4 +1,8 @@ #!/bin/sh +# +# SPDX-License-Identifier: MIT +# + ### BEGIN INIT INFO # Provides: module-init-tools # Required-Start: diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index aa71309126f..8f4fdd76bfb 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb @@ -1,9 +1,8 @@ SUMMARY = "Initscript for auto-loading kernel modules on boot" SECTION = "base" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098" -SRC_URI = "file://modutils.sh \ - file://PD.patch" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://modutils.sh;beginline=3;endline=3;md5=b2dccaa94b3629a08bfb4f983cad6f89" +SRC_URI = "file://modutils.sh" PR = "r7"
The file was originally added to OE here: https://git.openembedded.org/openembedded/commit/modutils/files/modutils.sh?id=3b3989442075d0a4c6c32cb187de17d87bf65fbd and the license added here as "PD": https://git.openembedded.org/openembedded/commit/modutils/modutils-initscripts.oe?id=4f7d2b1b63d166e5de146d71e5c942419424446e As "Public Domain", we can re-license it to MIT, which fits in with the rest of our metadata and has an SPDX identifier, so lets do that and try and keep our licenses simpler. This also them removes the need for a weird license patch in SRC_URI. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-kernel/modutils-initscripts/files/PD.patch | 8 -------- .../recipes-kernel/modutils-initscripts/files/modutils.sh | 4 ++++ .../modutils-initscripts/modutils-initscripts.bb | 7 +++---- 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-kernel/modutils-initscripts/files/PD.patch