[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-476-g305f29320

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  305f293201a1d75f24eaa188294b78b284c8185b (commit)
      from  0de852f56130bfffa427bbc04bcea0370eecb0f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 305f293201a1d75f24eaa188294b78b284c8185b
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Jan 4 22:26:38 2024 +0100

    LICENSES: drop SPDX tag 'GPL-2.0' and use 'GPL-2.0-only'
    
    The SPDX tag 'GPL-2.0' has been deprecated in
    https://spdx.org/licenses/GPL-2.0.html
    and the preferred tag is now 'GPL-2.0-only'
    https://spdx.org/licenses/GPL-2.0-only.html
    
    Update the LICENSES documents and the SPDX of the only file that
    reports the deprecated tag.
    
    Change-Id: I3c3215438bc4378ff470bb9fa8fa962505a9ae50
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8064
    Tested-by: jenkins

diff --git a/LICENSES/license-rules.txt b/LICENSES/license-rules.txt
index c75192930..ecc8e4db1 100644
--- a/LICENSES/license-rules.txt
+++ b/LICENSES/license-rules.txt
@@ -173,7 +173,6 @@ OpenOCD, can be broken down into:
 
    File format examples::
 
-      Valid-License-Identifier: GPL-2.0
       Valid-License-Identifier: GPL-2.0-only
       Valid-License-Identifier: GPL-2.0-or-later
       SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
@@ -182,8 +181,6 @@ OpenOCD, can be broken down into:
         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
-        or
           SPDX-License-Identifier: GPL-2.0-only
         For 'GNU General Public License (GPL) version 2 or any later version' use:
           SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
index 2ca4651c3..687bdddb1 100644
--- a/LICENSES/preferred/GPL-2.0
+++ b/LICENSES/preferred/GPL-2.0
@@ -1,4 +1,3 @@
-Valid-License-Identifier: GPL-2.0
 Valid-License-Identifier: GPL-2.0-only
 Valid-License-Identifier: GPL-2.0-or-later
 SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
@@ -7,8 +6,6 @@ Usage-Guide:
   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
-  or
     SPDX-License-Identifier: GPL-2.0-only
   For 'GNU General Public License (GPL) version 2 or any later version' use:
     SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/src/target/mips_cpu.h b/src/target/mips_cpu.h
index 2f31dbd66..c3b7b54ba 100644
--- a/src/target/mips_cpu.h
+++ b/src/target/mips_cpu.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef OPENOCD_TARGET_MIPS_CPU_H
 #define OPENOCD_TARGET_MIPS_CPU_H
 

-----------------------------------------------------------------------

Summary of changes:
 LICENSES/license-rules.txt | 3 ---
 LICENSES/preferred/GPL-2.0 | 3 ---
 src/target/mips_cpu.h      | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository