[meta-cgl,1/1] LICENSE: update to standard SPDX names

Message ID 20220413205920.35055-1-joe.slater@windriver.com
State New
Headers show
Series [meta-cgl,1/1] LICENSE: update to standard SPDX names | expand

Commit Message

Slater, Joseph April 13, 2022, 8:59 p.m. UTC
Use convert-spdx-licenses.py to change LICENSE in two recipes.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
 meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb     | 2 +-
 meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jeremy Puhlman April 25, 2022, 4:12 p.m. UTC | #1
Merged, thanks.

On 4/13/2022 1:59 PM, Joe Slater wrote:
> Use convert-spdx-licenses.py to change LICENSE in two recipes.
>
> Signed-off-by: Joe Slater <joe.slater@windriver.com>
> ---
>   meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb     | 2 +-
>   meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
> index edaeb8b..a6076cc 100644
> --- a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
> +++ b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
> @@ -10,7 +10,7 @@ SRC_URI = "https://releases.pagure.org/linux-cluster/cluster/${BP}.tar.xz \
>   SRC_URI[md5sum] = "300d83dbbc525c3da21c2e961271c84b"
>   SRC_URI[sha256sum] = "4d340338c2376d369cb223469fa1a3356cce9ab5b2a0a0a33256ade2dbbe02d1"
>   
> -LICENSE = "GPL-2.0 & LGPL-2.0"
> +LICENSE = "GPL-2.0-only & LGPL-2.0-only"
>   LIC_FILES_CHKSUM = "file://doc/README.licence;md5=ee8ae43af5ea09f12ca7f7a649764cb0"
>   
>   PR = "r1"
> diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
> index b5dfad0..7b9e875 100644
> --- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
> +++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
> @@ -22,7 +22,7 @@ It implements the following kinds of heartbeats: \
>   "
>   HOMEPAGE = "http://linux-ha.org/"
>   SECTION = "System Environment/Daemons"
> -LICENSE = "GPLv2 & LGPLv2+"
> +LICENSE = "GPL-2.0-only & LGPL-2.0-or-later"
>   LIC_FILES_CHKSUM = " \
>       file://doc/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
>       file://doc/COPYING.LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#56768): https://lists.yoctoproject.org/g/yocto/message/56768
> Mute This Topic: https://lists.yoctoproject.org/mt/90450845/2167262
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [jpuhlman@mvista.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
index edaeb8b..a6076cc 100644
--- a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
@@ -10,7 +10,7 @@  SRC_URI = "https://releases.pagure.org/linux-cluster/cluster/${BP}.tar.xz \
 SRC_URI[md5sum] = "300d83dbbc525c3da21c2e961271c84b"
 SRC_URI[sha256sum] = "4d340338c2376d369cb223469fa1a3356cce9ab5b2a0a0a33256ade2dbbe02d1"
 
-LICENSE = "GPL-2.0 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://doc/README.licence;md5=ee8ae43af5ea09f12ca7f7a649764cb0"
 
 PR = "r1"
diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
index b5dfad0..7b9e875 100644
--- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
+++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
@@ -22,7 +22,7 @@  It implements the following kinds of heartbeats: \
 "
 HOMEPAGE = "http://linux-ha.org/"
 SECTION = "System Environment/Daemons"
-LICENSE = "GPLv2 & LGPLv2+"
+LICENSE = "GPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
     file://doc/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
     file://doc/COPYING.LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \