From nobody Mon Feb 9 21:21:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1683310593; cv=none; d=zohomail.com; s=zohoarc; b=fcn9NWGhaKPlVXAq936yH5c+5Xawtlb6KW35UceUONHcqibCG/yx0MQkkYO2FR8rmLiJl4Axy77TcKHPB+CvZxC+cTu332o9bZiS3a2bf8OkE7AlMnAyvtoh6i8AoPhVImug3PNLN5eUI09lvD8dqO71txfAvSHL+Pyx+2k5Shs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683310593; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BeLh+XrBFyB3Slo0SyH+zYMbNlaVIQHopkFLF3IonVM=; b=oMEFN3G+o2LtgEgBOMSDCbUqSZPKiGakCcE+t0SiSN0oFwql20qBu7xH3wwXdOGDB0XUeq+coq+mDKk9nHfPSvELGGKMfycY0HvdGgHGd2z8qROP76VRvkhgK08cSxcdfYgPxhtq2sWg5tZKsB919vZLaLHDL76S1mDA1nb72Gk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 168331059352513.793103781833565; Fri, 5 May 2023 11:16:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.530609.826356 (Exim 4.92) (envelope-from ) id 1puzyK-0002s8-Dj; Fri, 05 May 2023 18:16:00 +0000 Received: by outflank-mailman (output) from mailman id 530609.826356; Fri, 05 May 2023 18:16:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1puzyK-0002rv-AL; Fri, 05 May 2023 18:16:00 +0000 Received: by outflank-mailman (input) for mailman id 530609; Fri, 05 May 2023 18:15:59 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1puzyJ-0002Jh-No for xen-devel@lists.xenproject.org; Fri, 05 May 2023 18:15:59 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e1b163f8-eb70-11ed-8611-37d641c3527e; Fri, 05 May 2023 20:15:57 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e1b163f8-eb70-11ed-8611-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1683310557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1TQCZfeuZrxoYx6xAHLXfz0lWk/9oAGfIUvqEwt1EAY=; b=bck/AeeL2Q10dE+omKlXGA4dFSg3UvzWK2O5/jrvWh7nTWw7EjKCirch YP8GSNshhPRpSKQZh3hlEf74CyufL4zAYhvE72Dfu1PJj1srmdUjMLDw8 WpDQpLM2Jl+gDwDB414/ugXwLW6l7jyVSfqm/un9Gix2h/wiO/S7WwWAu 4=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 110484432 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.123 X-Policy: $RELAYED IronPort-Data: A9a23:N56p7qlkX3X9MgmaceCoa6bo5gyYJkRdPkR7XQ2eYbSJt1+Wr1Gzt xIbX2DUOfuCZmP8f992aY3joRhU7MLVndU2TgJkrn1mQyMWpZLJC+rCIxarNUt+DCFhoGFPt JxCN4aafKjYaleG+39B55C49SEUOZmgH+a6U6icfHgqH2eIcQ954Tp7gek1n4V0ttawBgKJq LvartbWfVSowFaYCEpNg064gE4p7aWaVA8w5ARkPqgW5AKGzRH5MbpETU2PByqgKmVrNrbSq 9brlNmR4m7f9hExPdKp+p6TnpoiG+O60aCm0xK6aoD66vRwjnVaPpUTbZLwXXx/mTSR9+2d/ f0W3XCGpaXFCYWX8AgVe0Ew/yiTpsSq8pefSZS0mZT7I0Er7xIAahihZa07FdRwxwp5PY1B3 aUKGAwiS06mvOXsz6qaZcBOhppyLda+aevzulk4pd3YJfMvQJSFSKTW/95Imjw3g6iiH96HO ZBfM2A2Kk2dPVsWYAx/5JEWxY9EglHWdTFCpU3Tjq0w+2XJlyR60aT3McqTcduPLSlQth/B/ j6WoziiWHn2MvS7mB2GwjGL2NbTnCPFG6BOHaXmzvd11Qj7Kms7V0RNCArTTeOCol6zXZdTJ lIZ/gIqrLMu7wq7Q9/lRRq6rXWY+BkGVLJ4Eec39QWMwar8+BuCCy4PSTspQMc9qMY8SDgu1 1mIt9DkHzpitPuSU3313qiQhSO/P24SN2BqTS0ZSQoI5fHzrYd1iQjAJuuPC4bs0IezQ2uph WnX8m5n3e57YdM3O7uTpEL3vx2J+L3ySVQ6/iT4d0ClsFJ4e9vwD2C30mQ3/cqsPa7AEAna5 iVVwpHBhAwdJcrTzXLQGY3hCJnsvq/Ya2OE3DaDCrF7r1yQF2ifkZe8Cd2UDGNgKY46dDDge yc/UisBtcYIbBNGgUKaCr9d6vjGLoC6T7wJrtiOMrJzjmFZLWdrBh1Ga0+KxHzKm0Mxi6w5M przWZ/yXS1AU/o7lWvuHLh1PVoX+8zD7TmLGcCTI+qPiNJym0J5uZ9aaQDTP4jVHYuPoRnP8 sY3CvZmPy53CbWkCgGOqN57ELz/BSRjbXwAg5ANJ7Hrz8sPMD1JNsI9Npt7It0/w/oNyruZl px/M2cBoGfCabT8AV3iQhhehHnHBv6TcVpT0fQQAGuV IronPort-HdrOrdr: A9a23:mwvKjawAML+aSZ6e0BgRKrPw3L1zdoMgy1knxilNoHxuH/Bw9v re+MjzsCWftN9/Yh4dcLy7VpVoIkmskKKdg7NhXotKNTOO0AeVxedZjLcKqweKJ8SUzJ8+6U 4PSchD4abLfD9HZcaR2njFLz4jquP3j5xBU43lvglQpQIBUdAQ0+9gYDzrdHGf3GN9dOAE/J z33Ls/mxOQPU45Q+6cHXc/U+3Kt7Tw5e/biU5vPW9e1OGW5wnYk4LHLw== X-Talos-CUID: 9a23:Th/WcG7hWet5+YNtWtssrVwkJu8ALFjmyy3fO26XIERpFuyUVgrF X-Talos-MUID: 9a23:0KCkDwtfXb6SUV25zs2noGBFN/crxPqXFEENr9Yk58CcaxR5JGLI X-IronPort-AV: E=Sophos;i="5.99,252,1677560400"; d="scan'208";a="110484432" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , George Dunlap , Jan Beulich , Stefano Stabellini , Wei Liu , Julien Grall Subject: [PATCH v2 2/2] LICENSES: Remove the use of deprecated SPDX tags Date: Fri, 5 May 2023 19:15:28 +0100 Message-ID: <20230505181528.3587485-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230505181528.3587485-1-andrew.cooper3@citrix.com> References: <20230505181528.3587485-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1683310594073100002 Content-Type: text/plain; charset="utf-8" The GPL and LGPL SPDX forms without an explicit -only or -or-later suffix a= re deprecated and should not be used. Update the documention. Somewhat unhelpfully at the time of writing, this only appears to be indica= ted 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 identi= fy them as such and recommend that no new instances get added. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- CC: George Dunlap CC: Jan Beulich CC: Stefano Stabellini CC: Wei Liu CC: Julien Grall 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 =20 -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+ =20 Usage-Guide: =20 @@ -13,14 +15,13 @@ Usage-Guide: =20 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 =20 For 'GNU General Public License (GPL) version 2 or any later version' us= e: - SPDX-License-Identifier: GPL-2.0+ - or SPDX-License-Identifier: GPL-2.0-or-later =20 + The deprecated tags should not be used for any new additions. Where + possible, their existing uses should be phased out. + License-Text: =20 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 =20 -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 =20 Usage-Guide: =20 @@ -10,11 +11,11 @@ Usage-Guide: guidelines in the licensing rules documentation. =20 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 =20 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 =20 License-Text: =20 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 =20 -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 =20 Usage-Guide: =20 @@ -10,11 +11,11 @@ Usage-Guide: guidelines in the licensing rules documentation. =20 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 =20 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 =20 License-Text: =20 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. =20 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_inf= o.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 */ =20 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 *=20 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 */ =20 #include #include diff --git a/tools/libacpi/ssdt_laptop_slate.asl b/tools/libacpi/ssdt_lapto= p_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. --=20 2.30.2