* [PATCH v2 0/2] LICENSES improvements/corrections
@ 2023-05-05 18:15 Andrew Cooper
2023-05-05 18:15 ` [PATCH v2 1/2] LICENSES: Improve the legibility of these files Andrew Cooper
2023-05-05 18:15 ` [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags Andrew Cooper
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Cooper @ 2023-05-05 18:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper
Noticed in light of the recent LGPL changes to libacpi, but sadly only after
the fact. Minor updates in the second patch.
Andrew Cooper (2):
LICENSES: Improve the legibility of these files
LICENSES: Remove the use of deprecated SPDX tags
LICENSES/BSD-2-Clause | 4 ++++
LICENSES/BSD-3-Clause | 4 ++++
LICENSES/BSD-3-Clause-Clear | 4 ++++
LICENSES/CC-BY-4.0 | 5 +++++
LICENSES/GPL-2.0 | 21 ++++++++++++++-------
LICENSES/LGPL-2.0 | 17 ++++++++++++-----
LICENSES/LGPL-2.1 | 17 ++++++++++++-----
LICENSES/MIT | 4 ++++
tools/libacpi/Makefile | 2 +-
tools/libacpi/acpi2_0.h | 2 +-
tools/libacpi/build.c | 2 +-
tools/libacpi/dsdt.asl | 2 +-
tools/libacpi/dsdt_acpi_info.asl | 2 +-
tools/libacpi/libacpi.h | 2 +-
tools/libacpi/mk_dsdt.c | 2 +-
tools/libacpi/ssdt_laptop_slate.asl | 2 +-
tools/libacpi/ssdt_pm.asl | 2 +-
tools/libacpi/ssdt_s3.asl | 2 +-
tools/libacpi/ssdt_s4.asl | 2 +-
tools/libacpi/ssdt_tpm.asl | 2 +-
tools/libacpi/static_tables.c | 2 +-
21 files changed, 72 insertions(+), 30 deletions(-)
base-commit: e93e635e142d45e3904efb4a05e2b3b52a708b4f
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] LICENSES: Improve the legibility of these files
2023-05-05 18:15 [PATCH v2 0/2] LICENSES improvements/corrections Andrew Cooper
@ 2023-05-05 18:15 ` Andrew Cooper
2023-05-05 18:15 ` [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags Andrew Cooper
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Cooper @ 2023-05-05 18:15 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Jan Beulich, George Dunlap, Jan Beulich,
Stefano Stabellini, Wei Liu, Julien Grall
A few newlines go a very long way.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
CC: George Dunlap <George.Dunlap@eu.citrix.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Wei Liu <wl@xen.org>
CC: Julien Grall <julien@xen.org>
---
LICENSES/BSD-2-Clause | 4 ++++
LICENSES/BSD-3-Clause | 4 ++++
LICENSES/BSD-3-Clause-Clear | 4 ++++
LICENSES/CC-BY-4.0 | 5 +++++
LICENSES/GPL-2.0 | 6 ++++++
LICENSES/LGPL-2.0 | 6 ++++++
LICENSES/LGPL-2.1 | 6 ++++++
LICENSES/MIT | 4 ++++
8 files changed, 39 insertions(+)
diff --git a/LICENSES/BSD-2-Clause b/LICENSES/BSD-2-Clause
index da366e2ce50b..694d8c93221c 100644
--- a/LICENSES/BSD-2-Clause
+++ b/LICENSES/BSD-2-Clause
@@ -1,10 +1,14 @@
Valid-License-Identifier: BSD-2-Clause
+
SPDX-URL: https://spdx.org/licenses/BSD-2-Clause.html
+
Usage-Guide:
+
To use the BSD 2-clause "Simplified" License put the following SPDX
tag/value pair into a comment according to the placement guidelines in
the licensing rules documentation:
SPDX-License-Identifier: BSD-2-Clause
+
License-Text:
Copyright (c) <year> <owner> . All rights reserved.
diff --git a/LICENSES/BSD-3-Clause b/LICENSES/BSD-3-Clause
index 34c7f057c8d5..1441947f92e0 100644
--- a/LICENSES/BSD-3-Clause
+++ b/LICENSES/BSD-3-Clause
@@ -1,10 +1,14 @@
Valid-License-Identifier: BSD-3-Clause
+
SPDX-URL: https://spdx.org/licenses/BSD-3-Clause.html
+
Usage-Guide:
+
To use the BSD 3-clause "New" or "Revised" License put the following SPDX
tag/value pair into a comment according to the placement guidelines in
the licensing rules documentation:
SPDX-License-Identifier: BSD-3-Clause
+
License-Text:
Copyright (c) <year> <owner> . All rights reserved.
diff --git a/LICENSES/BSD-3-Clause-Clear b/LICENSES/BSD-3-Clause-Clear
index e53b56092b90..2b27f24a65a0 100644
--- a/LICENSES/BSD-3-Clause-Clear
+++ b/LICENSES/BSD-3-Clause-Clear
@@ -1,10 +1,14 @@
Valid-License-Identifier: BSD-3-Clause-Clear
+
SPDX-URL: https://spdx.org/licenses/BSD-3-Clause-Clear.html
+
Usage-Guide:
+
To use the BSD 3-clause "Clear" License put the following SPDX
tag/value pair into a comment according to the placement guidelines in
the licensing rules documentation:
SPDX-License-Identifier: BSD-3-Clause-Clear
+
License-Text:
The Clear BSD License
diff --git a/LICENSES/CC-BY-4.0 b/LICENSES/CC-BY-4.0
index 27dfefa95ccf..4197ceb180ff 100644
--- a/LICENSES/CC-BY-4.0
+++ b/LICENSES/CC-BY-4.0
@@ -1,15 +1,20 @@
Valid-License-Identifier: CC-BY-4.0
+
SPDX-URL: https://spdx.org/licenses/CC-BY-4.0
+
Usage-Guide:
+
Do NOT use this license for code, but it's acceptable for content like artwork
or documentation. When using it for the latter, it's best to use it together
with a GPL2 compatible license using "OR", as CC-BY-4.0 texts processed by
the kernel's build system might combine it with content taken from more
restrictive licenses.
+
To use the Creative Commons Attribution 4.0 International license put
the following SPDX tag/value pair into a comment according to the
placement guidelines in the licensing rules documentation:
SPDX-License-Identifier: CC-BY-4.0
+
License-Text:
Creative Commons Attribution 4.0 International
diff --git a/LICENSES/GPL-2.0 b/LICENSES/GPL-2.0
index 9f09528a8bce..fa5c66236fe9 100644
--- a/LICENSES/GPL-2.0
+++ b/LICENSES/GPL-2.0
@@ -2,19 +2,25 @@ Valid-License-Identifier: GPL-2.0
Valid-License-Identifier: GPL-2.0-only
Valid-License-Identifier: GPL-2.0+
Valid-License-Identifier: GPL-2.0-or-later
+
SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
+
Usage-Guide:
+
To use this license in source code, put one of the following SPDX
tag/value pairs into a comment according to the placement
guidelines in the licensing rules documentation.
+
For 'GNU General Public License (GPL) version 2 only' use:
SPDX-License-Identifier: GPL-2.0-only
or (now deprecated)
SPDX-License-Identifier: GPL-2.0
+
For 'GNU General Public License (GPL) version 2 or any later version' use:
SPDX-License-Identifier: GPL-2.0+
or
SPDX-License-Identifier: GPL-2.0-or-later
+
License-Text:
GNU GENERAL PUBLIC LICENSE
diff --git a/LICENSES/LGPL-2.0 b/LICENSES/LGPL-2.0
index 957d798fe037..2fa16d72eabf 100644
--- a/LICENSES/LGPL-2.0
+++ b/LICENSES/LGPL-2.0
@@ -1,15 +1,21 @@
Valid-License-Identifier: LGPL-2.0
Valid-License-Identifier: LGPL-2.0+
+
SPDX-URL: https://spdx.org/licenses/LGPL-2.0.html
+
Usage-Guide:
+
To use this license in source code, put one of the following SPDX
tag/value pairs into a comment according to the placement
guidelines in the licensing rules documentation.
+
For 'GNU Library General Public License (LGPL) version 2.0 only' use:
SPDX-License-Identifier: LGPL-2.0
+
For 'GNU Library General Public License (LGPL) version 2.0 or any later
version' use:
SPDX-License-Identifier: LGPL-2.0+
+
License-Text:
GNU LIBRARY GENERAL PUBLIC LICENSE
diff --git a/LICENSES/LGPL-2.1 b/LICENSES/LGPL-2.1
index 27bb4342a3e8..b366c7e49199 100644
--- a/LICENSES/LGPL-2.1
+++ b/LICENSES/LGPL-2.1
@@ -1,15 +1,21 @@
Valid-License-Identifier: LGPL-2.1
Valid-License-Identifier: LGPL-2.1+
+
SPDX-URL: https://spdx.org/licenses/LGPL-2.1.html
+
Usage-Guide:
+
To use this license in source code, put one of the following SPDX
tag/value pairs into a comment according to the placement
guidelines in the licensing rules documentation.
+
For 'GNU Lesser General Public License (LGPL) version 2.1 only' use:
SPDX-License-Identifier: LGPL-2.1
+
For 'GNU Lesser General Public License (LGPL) version 2.1 or any later
version' use:
SPDX-License-Identifier: LGPL-2.1+
+
License-Text:
GNU LESSER GENERAL PUBLIC LICENSE
diff --git a/LICENSES/MIT b/LICENSES/MIT
index f33a68ceb3ea..eba1549f93e4 100644
--- a/LICENSES/MIT
+++ b/LICENSES/MIT
@@ -1,10 +1,14 @@
Valid-License-Identifier: MIT
+
SPDX-URL: https://spdx.org/licenses/MIT.html
+
Usage-Guide:
+
To use the MIT License put the following SPDX tag/value pair into a
comment according to the placement guidelines in the licensing rules
documentation:
SPDX-License-Identifier: MIT
+
License-Text:
MIT License
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags
2023-05-05 18:15 [PATCH v2 0/2] LICENSES improvements/corrections Andrew Cooper
2023-05-05 18:15 ` [PATCH v2 1/2] LICENSES: Improve the legibility of these files Andrew Cooper
@ 2023-05-05 18:15 ` Andrew Cooper
2023-05-05 22:34 ` Stefano Stabellini
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Cooper @ 2023-05-05 18:15 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Jan Beulich, George Dunlap, Jan Beulich,
Stefano Stabellini, Wei Liu, Julien Grall
The GPL and LGPL SPDX forms without an explicit -only or -or-later suffix are
deprecated and should not be used. Update the documention.
Somewhat unhelpfully at the time of writing, this only appears to be indicated
by the separation of the two tables at https://spdx.org/licenses/
The recent changes to libacpi are the only examples of deprecated LGPL tags in
tree, so fix them all up.
For GPL, we have many examples using deprecated tags. For now, just identify
them as such and recommend that no new instances get added.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
CC: George Dunlap <George.Dunlap@eu.citrix.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Wei Liu <wl@xen.org>
CC: Julien Grall <julien@xen.org>
Unsure whether this should get some Fixes: tags or not. Note also that
Jenny's "[PATCH v4 2/2] acpi: Add TPM2 interface definition." wants its SPDX
tag correcting as per this patch.
v2:
* Extend commit message to include https://spdx.org/licenses/
* Update the URLs too
---
LICENSES/GPL-2.0 | 15 ++++++++-------
LICENSES/LGPL-2.0 | 11 ++++++-----
LICENSES/LGPL-2.1 | 11 ++++++-----
tools/libacpi/Makefile | 2 +-
tools/libacpi/acpi2_0.h | 2 +-
tools/libacpi/build.c | 2 +-
tools/libacpi/dsdt.asl | 2 +-
tools/libacpi/dsdt_acpi_info.asl | 2 +-
tools/libacpi/libacpi.h | 2 +-
tools/libacpi/mk_dsdt.c | 2 +-
tools/libacpi/ssdt_laptop_slate.asl | 2 +-
tools/libacpi/ssdt_pm.asl | 2 +-
tools/libacpi/ssdt_s3.asl | 2 +-
tools/libacpi/ssdt_s4.asl | 2 +-
tools/libacpi/ssdt_tpm.asl | 2 +-
tools/libacpi/static_tables.c | 2 +-
16 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/LICENSES/GPL-2.0 b/LICENSES/GPL-2.0
index fa5c66236fe9..07f332641ccd 100644
--- a/LICENSES/GPL-2.0
+++ b/LICENSES/GPL-2.0
@@ -1,9 +1,11 @@
-Valid-License-Identifier: GPL-2.0
Valid-License-Identifier: GPL-2.0-only
-Valid-License-Identifier: GPL-2.0+
Valid-License-Identifier: GPL-2.0-or-later
-SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
+SPDX-URL: https://spdx.org/licenses/GPL-2.0-only.html
+SPDX-URL: https://spdx.org/licenses/GPL-2.0-or-later.html
+
+Deprecated-Identifier: GPL-2.0
+Deprecated-Identifier: GPL-2.0+
Usage-Guide:
@@ -13,14 +15,13 @@ Usage-Guide:
For 'GNU General Public License (GPL) version 2 only' use:
SPDX-License-Identifier: GPL-2.0-only
- or (now deprecated)
- SPDX-License-Identifier: GPL-2.0
For 'GNU General Public License (GPL) version 2 or any later version' use:
- SPDX-License-Identifier: GPL-2.0+
- or
SPDX-License-Identifier: GPL-2.0-or-later
+ The deprecated tags should not be used for any new additions. Where
+ possible, their existing uses should be phased out.
+
License-Text:
GNU GENERAL PUBLIC LICENSE
diff --git a/LICENSES/LGPL-2.0 b/LICENSES/LGPL-2.0
index 2fa16d72eabf..100c72c6db8c 100644
--- a/LICENSES/LGPL-2.0
+++ b/LICENSES/LGPL-2.0
@@ -1,7 +1,8 @@
-Valid-License-Identifier: LGPL-2.0
-Valid-License-Identifier: LGPL-2.0+
+Valid-License-Identifier: LGPL-2.0-only
+Valid-License-Identifier: LGPL-2.0-or-later
-SPDX-URL: https://spdx.org/licenses/LGPL-2.0.html
+SPDX-URL: https://spdx.org/licenses/LGPL-2.0-only.html
+SPDX-URL: https://spdx.org/licenses/LGPL-2.0-or-later.html
Usage-Guide:
@@ -10,11 +11,11 @@ Usage-Guide:
guidelines in the licensing rules documentation.
For 'GNU Library General Public License (LGPL) version 2.0 only' use:
- SPDX-License-Identifier: LGPL-2.0
+ SPDX-License-Identifier: LGPL-2.0-only
For 'GNU Library General Public License (LGPL) version 2.0 or any later
version' use:
- SPDX-License-Identifier: LGPL-2.0+
+ SPDX-License-Identifier: LGPL-2.0-or-later
License-Text:
diff --git a/LICENSES/LGPL-2.1 b/LICENSES/LGPL-2.1
index b366c7e49199..d3e213c39c26 100644
--- a/LICENSES/LGPL-2.1
+++ b/LICENSES/LGPL-2.1
@@ -1,7 +1,8 @@
-Valid-License-Identifier: LGPL-2.1
-Valid-License-Identifier: LGPL-2.1+
+Valid-License-Identifier: LGPL-2.1-only
+Valid-License-Identifier: LGPL-2.1-or-later
-SPDX-URL: https://spdx.org/licenses/LGPL-2.1.html
+SPDX-URL: https://spdx.org/licenses/LGPL-2.1-only.html
+SPDX-URL: https://spdx.org/licenses/LGPL-2.1-or-later.html
Usage-Guide:
@@ -10,11 +11,11 @@ Usage-Guide:
guidelines in the licensing rules documentation.
For 'GNU Lesser General Public License (LGPL) version 2.1 only' use:
- SPDX-License-Identifier: LGPL-2.1
+ SPDX-License-Identifier: LGPL-2.1-only
For 'GNU Lesser General Public License (LGPL) version 2.1 or any later
version' use:
- SPDX-License-Identifier: LGPL-2.1+
+ SPDX-License-Identifier: LGPL-2.1-or-later
License-Text:
diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index aa9c520cbe85..bcfcd852f92f 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1
+# SPDX-License-Identifier: LGPL-2.1-only
#
# Copyright (c) 2004, Intel Corporation.
diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h
index 212f5ab64182..e00b29854be0 100644
--- a/tools/libacpi/acpi2_0.h
+++ b/tools/libacpi/acpi2_0.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* Copyright (c) 2004, Intel Corporation.
*/
diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c
index 830d37c61f03..3142e0ac84c0 100644
--- a/tools/libacpi/build.c
+++ b/tools/libacpi/build.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* Copyright (c) 2004, Intel Corporation.
* Copyright (c) 2006, Keir Fraser, XenSource Inc.
diff --git a/tools/libacpi/dsdt.asl b/tools/libacpi/dsdt.asl
index c6691b56a986..32b42f85ae9f 100644
--- a/tools/libacpi/dsdt.asl
+++ b/tools/libacpi/dsdt.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/******************************************************************************
* DSDT for Xen with Qemu device model
*
diff --git a/tools/libacpi/dsdt_acpi_info.asl b/tools/libacpi/dsdt_acpi_info.asl
index c6e82f1fe6a7..6e114fa23404 100644
--- a/tools/libacpi/dsdt_acpi_info.asl
+++ b/tools/libacpi/dsdt_acpi_info.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
Scope (\_SB)
{
diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h
index acf012e35578..7ae28525f604 100644
--- a/tools/libacpi/libacpi.h
+++ b/tools/libacpi/libacpi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/******************************************************************************
* libacpi.h
*
diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c
index c74b270c0c5d..34f6753f6193 100644
--- a/tools/libacpi/mk_dsdt.c
+++ b/tools/libacpi/mk_dsdt.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/libacpi/ssdt_laptop_slate.asl b/tools/libacpi/ssdt_laptop_slate.asl
index 494f2d048d0a..69fd504c19fc 100644
--- a/tools/libacpi/ssdt_laptop_slate.asl
+++ b/tools/libacpi/ssdt_laptop_slate.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* ssdt_conv.asl
*
diff --git a/tools/libacpi/ssdt_pm.asl b/tools/libacpi/ssdt_pm.asl
index e577e85c072b..db578d10ac3e 100644
--- a/tools/libacpi/ssdt_pm.asl
+++ b/tools/libacpi/ssdt_pm.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* ssdt_pm.asl
*
diff --git a/tools/libacpi/ssdt_s3.asl b/tools/libacpi/ssdt_s3.asl
index 8f3177ec5adc..f6e9636f4759 100644
--- a/tools/libacpi/ssdt_s3.asl
+++ b/tools/libacpi/ssdt_s3.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* ssdt_s3.asl
*
diff --git a/tools/libacpi/ssdt_s4.asl b/tools/libacpi/ssdt_s4.asl
index 979318eca1f5..8014f5fc9014 100644
--- a/tools/libacpi/ssdt_s4.asl
+++ b/tools/libacpi/ssdt_s4.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* ssdt_s4.asl
*
diff --git a/tools/libacpi/ssdt_tpm.asl b/tools/libacpi/ssdt_tpm.asl
index 6c3267218f3b..944658d25177 100644
--- a/tools/libacpi/ssdt_tpm.asl
+++ b/tools/libacpi/ssdt_tpm.asl
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* ssdt_tpm.asl
*
diff --git a/tools/libacpi/static_tables.c b/tools/libacpi/static_tables.c
index 631fb911413b..715f46fee05c 100644
--- a/tools/libacpi/static_tables.c
+++ b/tools/libacpi/static_tables.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1 */
+/* SPDX-License-Identifier: LGPL-2.1-only */
/*
* Copyright (c) 2004, Intel Corporation.
* Copyright (c) 2006, Keir Fraser, XenSource Inc.
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags
2023-05-05 18:15 ` [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags Andrew Cooper
@ 2023-05-05 22:34 ` Stefano Stabellini
0 siblings, 0 replies; 4+ messages in thread
From: Stefano Stabellini @ 2023-05-05 22:34 UTC (permalink / raw)
To: Andrew Cooper
Cc: Xen-devel, Jan Beulich, George Dunlap, Jan Beulich,
Stefano Stabellini, Wei Liu, Julien Grall
On Fri, 5 May 2023, Andrew Cooper wrote:
> The GPL and LGPL SPDX forms without an explicit -only or -or-later suffix are
> deprecated and should not be used. Update the documention.
>
> Somewhat unhelpfully at the time of writing, this only appears to be indicated
> by the separation of the two tables at https://spdx.org/licenses/
>
> The recent changes to libacpi are the only examples of deprecated LGPL tags in
> tree, so fix them all up.
>
> For GPL, we have many examples using deprecated tags. For now, just identify
> them as such and recommend that no new instances get added.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> CC: George Dunlap <George.Dunlap@eu.citrix.com>
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Wei Liu <wl@xen.org>
> CC: Julien Grall <julien@xen.org>
>
> Unsure whether this should get some Fixes: tags or not. Note also that
> Jenny's "[PATCH v4 2/2] acpi: Add TPM2 interface definition." wants its SPDX
> tag correcting as per this patch.
>
> v2:
> * Extend commit message to include https://spdx.org/licenses/
> * Update the URLs too
> ---
> LICENSES/GPL-2.0 | 15 ++++++++-------
> LICENSES/LGPL-2.0 | 11 ++++++-----
> LICENSES/LGPL-2.1 | 11 ++++++-----
> tools/libacpi/Makefile | 2 +-
> tools/libacpi/acpi2_0.h | 2 +-
> tools/libacpi/build.c | 2 +-
> tools/libacpi/dsdt.asl | 2 +-
> tools/libacpi/dsdt_acpi_info.asl | 2 +-
> tools/libacpi/libacpi.h | 2 +-
> tools/libacpi/mk_dsdt.c | 2 +-
> tools/libacpi/ssdt_laptop_slate.asl | 2 +-
> tools/libacpi/ssdt_pm.asl | 2 +-
> tools/libacpi/ssdt_s3.asl | 2 +-
> tools/libacpi/ssdt_s4.asl | 2 +-
> tools/libacpi/ssdt_tpm.asl | 2 +-
> tools/libacpi/static_tables.c | 2 +-
> 16 files changed, 33 insertions(+), 30 deletions(-)
>
> diff --git a/LICENSES/GPL-2.0 b/LICENSES/GPL-2.0
> index fa5c66236fe9..07f332641ccd 100644
> --- a/LICENSES/GPL-2.0
> +++ b/LICENSES/GPL-2.0
> @@ -1,9 +1,11 @@
> -Valid-License-Identifier: GPL-2.0
> Valid-License-Identifier: GPL-2.0-only
> -Valid-License-Identifier: GPL-2.0+
> Valid-License-Identifier: GPL-2.0-or-later
>
> -SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
> +SPDX-URL: https://spdx.org/licenses/GPL-2.0-only.html
> +SPDX-URL: https://spdx.org/licenses/GPL-2.0-or-later.html
> +
> +Deprecated-Identifier: GPL-2.0
> +Deprecated-Identifier: GPL-2.0+
>
> Usage-Guide:
>
> @@ -13,14 +15,13 @@ Usage-Guide:
>
> For 'GNU General Public License (GPL) version 2 only' use:
> SPDX-License-Identifier: GPL-2.0-only
> - or (now deprecated)
> - SPDX-License-Identifier: GPL-2.0
>
> For 'GNU General Public License (GPL) version 2 or any later version' use:
> - SPDX-License-Identifier: GPL-2.0+
> - or
> SPDX-License-Identifier: GPL-2.0-or-later
>
> + The deprecated tags should not be used for any new additions. Where
> + possible, their existing uses should be phased out.
> +
> License-Text:
>
> GNU GENERAL PUBLIC LICENSE
> diff --git a/LICENSES/LGPL-2.0 b/LICENSES/LGPL-2.0
> index 2fa16d72eabf..100c72c6db8c 100644
> --- a/LICENSES/LGPL-2.0
> +++ b/LICENSES/LGPL-2.0
> @@ -1,7 +1,8 @@
> -Valid-License-Identifier: LGPL-2.0
> -Valid-License-Identifier: LGPL-2.0+
> +Valid-License-Identifier: LGPL-2.0-only
> +Valid-License-Identifier: LGPL-2.0-or-later
>
> -SPDX-URL: https://spdx.org/licenses/LGPL-2.0.html
> +SPDX-URL: https://spdx.org/licenses/LGPL-2.0-only.html
> +SPDX-URL: https://spdx.org/licenses/LGPL-2.0-or-later.html
>
> Usage-Guide:
>
> @@ -10,11 +11,11 @@ Usage-Guide:
> guidelines in the licensing rules documentation.
>
> For 'GNU Library General Public License (LGPL) version 2.0 only' use:
> - SPDX-License-Identifier: LGPL-2.0
> + SPDX-License-Identifier: LGPL-2.0-only
>
> For 'GNU Library General Public License (LGPL) version 2.0 or any later
> version' use:
> - SPDX-License-Identifier: LGPL-2.0+
> + SPDX-License-Identifier: LGPL-2.0-or-later
>
> License-Text:
>
> diff --git a/LICENSES/LGPL-2.1 b/LICENSES/LGPL-2.1
> index b366c7e49199..d3e213c39c26 100644
> --- a/LICENSES/LGPL-2.1
> +++ b/LICENSES/LGPL-2.1
> @@ -1,7 +1,8 @@
> -Valid-License-Identifier: LGPL-2.1
> -Valid-License-Identifier: LGPL-2.1+
> +Valid-License-Identifier: LGPL-2.1-only
> +Valid-License-Identifier: LGPL-2.1-or-later
>
> -SPDX-URL: https://spdx.org/licenses/LGPL-2.1.html
> +SPDX-URL: https://spdx.org/licenses/LGPL-2.1-only.html
> +SPDX-URL: https://spdx.org/licenses/LGPL-2.1-or-later.html
>
> Usage-Guide:
>
> @@ -10,11 +11,11 @@ Usage-Guide:
> guidelines in the licensing rules documentation.
>
> For 'GNU Lesser General Public License (LGPL) version 2.1 only' use:
> - SPDX-License-Identifier: LGPL-2.1
> + SPDX-License-Identifier: LGPL-2.1-only
>
> For 'GNU Lesser General Public License (LGPL) version 2.1 or any later
> version' use:
> - SPDX-License-Identifier: LGPL-2.1+
> + SPDX-License-Identifier: LGPL-2.1-or-later
>
> License-Text:
>
> diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
> index aa9c520cbe85..bcfcd852f92f 100644
> --- a/tools/libacpi/Makefile
> +++ b/tools/libacpi/Makefile
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: LGPL-2.1
> +# SPDX-License-Identifier: LGPL-2.1-only
> #
> # Copyright (c) 2004, Intel Corporation.
>
> diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h
> index 212f5ab64182..e00b29854be0 100644
> --- a/tools/libacpi/acpi2_0.h
> +++ b/tools/libacpi/acpi2_0.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * Copyright (c) 2004, Intel Corporation.
> */
> diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c
> index 830d37c61f03..3142e0ac84c0 100644
> --- a/tools/libacpi/build.c
> +++ b/tools/libacpi/build.c
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * Copyright (c) 2004, Intel Corporation.
> * Copyright (c) 2006, Keir Fraser, XenSource Inc.
> diff --git a/tools/libacpi/dsdt.asl b/tools/libacpi/dsdt.asl
> index c6691b56a986..32b42f85ae9f 100644
> --- a/tools/libacpi/dsdt.asl
> +++ b/tools/libacpi/dsdt.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /******************************************************************************
> * DSDT for Xen with Qemu device model
> *
> diff --git a/tools/libacpi/dsdt_acpi_info.asl b/tools/libacpi/dsdt_acpi_info.asl
> index c6e82f1fe6a7..6e114fa23404 100644
> --- a/tools/libacpi/dsdt_acpi_info.asl
> +++ b/tools/libacpi/dsdt_acpi_info.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
>
> Scope (\_SB)
> {
> diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h
> index acf012e35578..7ae28525f604 100644
> --- a/tools/libacpi/libacpi.h
> +++ b/tools/libacpi/libacpi.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /******************************************************************************
> * libacpi.h
> *
> diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c
> index c74b270c0c5d..34f6753f6193 100644
> --- a/tools/libacpi/mk_dsdt.c
> +++ b/tools/libacpi/mk_dsdt.c
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
>
> #include <stdio.h>
> #include <stdarg.h>
> diff --git a/tools/libacpi/ssdt_laptop_slate.asl b/tools/libacpi/ssdt_laptop_slate.asl
> index 494f2d048d0a..69fd504c19fc 100644
> --- a/tools/libacpi/ssdt_laptop_slate.asl
> +++ b/tools/libacpi/ssdt_laptop_slate.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * ssdt_conv.asl
> *
> diff --git a/tools/libacpi/ssdt_pm.asl b/tools/libacpi/ssdt_pm.asl
> index e577e85c072b..db578d10ac3e 100644
> --- a/tools/libacpi/ssdt_pm.asl
> +++ b/tools/libacpi/ssdt_pm.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * ssdt_pm.asl
> *
> diff --git a/tools/libacpi/ssdt_s3.asl b/tools/libacpi/ssdt_s3.asl
> index 8f3177ec5adc..f6e9636f4759 100644
> --- a/tools/libacpi/ssdt_s3.asl
> +++ b/tools/libacpi/ssdt_s3.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * ssdt_s3.asl
> *
> diff --git a/tools/libacpi/ssdt_s4.asl b/tools/libacpi/ssdt_s4.asl
> index 979318eca1f5..8014f5fc9014 100644
> --- a/tools/libacpi/ssdt_s4.asl
> +++ b/tools/libacpi/ssdt_s4.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * ssdt_s4.asl
> *
> diff --git a/tools/libacpi/ssdt_tpm.asl b/tools/libacpi/ssdt_tpm.asl
> index 6c3267218f3b..944658d25177 100644
> --- a/tools/libacpi/ssdt_tpm.asl
> +++ b/tools/libacpi/ssdt_tpm.asl
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * ssdt_tpm.asl
> *
> diff --git a/tools/libacpi/static_tables.c b/tools/libacpi/static_tables.c
> index 631fb911413b..715f46fee05c 100644
> --- a/tools/libacpi/static_tables.c
> +++ b/tools/libacpi/static_tables.c
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> /*
> * Copyright (c) 2004, Intel Corporation.
> * Copyright (c) 2006, Keir Fraser, XenSource Inc.
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-05 22:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-05 18:15 [PATCH v2 0/2] LICENSES improvements/corrections Andrew Cooper
2023-05-05 18:15 ` [PATCH v2 1/2] LICENSES: Improve the legibility of these files Andrew Cooper
2023-05-05 18:15 ` [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags Andrew Cooper
2023-05-05 22:34 ` Stefano Stabellini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.