[meta-cgl-common,7/8] resource-agents: Update LICENSE variable

Message ID 20220402023907.1765138-7-mingli.yu@windriver.com
State New
Headers show
Series [meta-cgl-common,1/8] crmsh: Update LICENSE variable | expand

Commit Message

Yu, Mingli April 2, 2022, 2:39 a.m. UTC
From: Mingli Yu <mingli.yu@windriver.com>

Update LICENSE variable to use SPDX license identifiers.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../resource-agents_4.5.0.bb                   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Patch

diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
index c8b2fbd..9349ab9 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
@@ -4,15 +4,15 @@  to operate in a High Availability environment for both Pacemaker and \
 rgmanager service managers."
 HOMEPAGE = "http://sources.redhat.com/cluster/wiki/"
 
-LICENSE = "GPLv2+ & LGPLv2+ & GPLv3"
-LICENSE:${PN} = "GPLv2+ & LGPLv2+"
-LICENSE:${PN}-dev = "GPLv2+ & LGPLv2+"
-LICENSE:${PN}-staticdev = "GPLv2+ & LGPLv2+"
-LICENSE:${PN}-dbg = "GPLv2+ & LGPLv2+"
-LICENSE:${PN}-doc = "GPLv2+ & LGPLv2+"
-LICENSE:${PN}-extra = "GPLv3"
-LICENSE:${PN}-extra-dbg = "GPLv3"
-LICENSE:ldirectord = "GPLv2+"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & GPL-3.0-only"
+LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.0-or-later"
+LICENSE:${PN}-dev = "GPL-2.0-or-later & LGPL-2.0-or-later"
+LICENSE:${PN}-staticdev = "GPL-2.0-or-later & LGPL-2.0-or-later"
+LICENSE:${PN}-dbg = "GPL-2.0-or-later & LGPL-2.0-or-later"
+LICENSE:${PN}-doc = "GPL-2.0-or-later & LGPL-2.0-or-later"
+LICENSE:${PN}-extra = "GPL-3.0-only"
+LICENSE:${PN}-extra-dbg = "GPL-3.0-only"
+LICENSE:ldirectord = "GPL-2.0-or-later"
 
 SRC_URI = "git://github.com/ClusterLabs/resource-agents;branch=main;protocol=https \
            file://01-disable-doc-build.patch \