diff mbox series

[meta-arago,master/kirkstone] classes: tisdk-bundle: Update logic to handle SPDX license identifiers

Message ID 20230713095716.1439616-1-a-limaye@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master/kirkstone] classes: tisdk-bundle: Update logic to handle SPDX license identifiers | expand

Commit Message

Limaye, Aniket July 13, 2023, 9:57 a.m. UTC
Referring to this:
https://docs.yoctoproject.org/migration-guides/migration-4.0.html#license-changes

And this:
https://git.openembedded.org/openembedded-core/tree/scripts/contrib/convert-spdx-licenses.py#n21

The older logic to populate the GPLv3 Table was out of date and was
giving an empty table.
Have it look for the new SPDX pattern *GPL-3.0*

Signed-off-by: Aniket Limaye <a-limaye@ti.com>
---
 .../classes/tisdk-bundle.bbclass              | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index dbdc9a5a..1d14227f 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -249,7 +249,7 @@  echo "
 
 <p>Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.</p>
 
-<p>This GCC Runtime Library Exception ("Exception") is an additional permission under section 7 of the GNU General Public License, version 3 ("GPLv3"). It applies to a given file (the "Runtime Library") that bears a notice placed by the copyright holder of the file stating that the file is governed by GPLv3 along with this Exception.</p>
+<p>This GCC Runtime Library Exception ("Exception") is an additional permission under section 7 of the GNU General Public License, version 3 ("GPL-3.0"). It applies to a given file (the "Runtime Library") that bears a notice placed by the copyright holder of the file stating that the file is governed by GPL-3.0 along with this Exception.</p>
 
 <p>When you use GCC to compile a program, GCC may combine portions of certain GCC header files and runtime libraries with the compiled program. The purpose of this Exception is to allow compilation of non-GPL (including proprietary) programs to use, in this way, the header files and runtime libraries covered by this Exception.</p>
 
@@ -267,7 +267,7 @@  echo "
 <p>A Compilation Process is "Eligible" if it is done using GCC, alone or with other GPL-compatible software, or if it is done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC intermediate representations would not qualify as an Eligible Compilation Process.</p>
 
 <h3><b>1. Grant of Additional Permission.</b></h3>
-<p>You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.</p>
+<p>You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPL-3.0, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.</p>
 
 <h3><b>2. No Weakening of GCC Copyleft.</b></h3>
 <p>The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of GCC.</p>
@@ -296,7 +296,7 @@  Copyright © 2009 Free Software Foundation, Inc. http://fsf.org/
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
-This GCC Runtime Library Exception (Exception) is an additional permission under section 7 of the GNU General Public License, version 3 (GPLv3). It applies to a given file (the Runtime Library) that bears a notice placed by the copyright holder of the file stating that the file is governed by GPLv3 along with this Exception.
+This GCC Runtime Library Exception (Exception) is an additional permission under section 7 of the GNU General Public License, version 3 (GPL-3.0). It applies to a given file (the Runtime Library) that bears a notice placed by the copyright holder of the file stating that the file is governed by GPL-3.0 along with this Exception.
 
 When you use GCC to compile a program, GCC may combine portions of certain GCC header files and runtime libraries with the compiled program. The purpose of this Exception is to allow compilation of non-GPL (including proprietary) programs to use, in this way, the header files and runtime libraries covered by this Exception.
 0. Definitions.
@@ -314,7 +314,7 @@  The Compilation Process transforms code entirely represented in non-intermediate
 A Compilation Process is Eligible if it is done using GCC, alone or with other GPL-compatible software, or if it is done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC intermediate representations would not qualify as an Eligible Compilation Process.
 1. Grant of Additional Permission.
 
-You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.
+You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPL-3.0, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.
 2. No Weakening of GCC Copyleft.
 
 The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of GCC.
@@ -359,13 +359,13 @@  EOF
 sw_manifest_toolchain_host() {
     opkg_dir="${IMAGE_ROOTFS}/${TISDK_TOOLCHAIN_PATH}/sysroots/*86*-linux/var/lib/opkg/info"
 
-    sw_manifest_table_header "GPLv3 Development Host Content" "This table describes any GPLv3 software being delivered that is expected to run on a Development Host, instead of the target device."
+    sw_manifest_table_header "GPL-3.0 Development Host Content" "This table describes any GPL-3.0 software being delivered that is expected to run on a Development Host, instead of the target device."
 
     generate_sw_manifest_table $opkg_dir "true"
 
     sw_manifest_table_footer
 
-    sw_manifest_table_header "Development Host Content" "This table describes any software being delivered that is expected to run on a Development Host, instead of the target device.  Some of this software may be licensed under GPLv3 but it is not expected to be shipped as a product."
+    sw_manifest_table_header "Development Host Content" "This table describes any software being delivered that is expected to run on a Development Host, instead of the target device.  Some of this software may be licensed under GPL-3.0 but it is not expected to be shipped as a product."
 
     generate_sw_manifest_table $opkg_dir
 
@@ -377,24 +377,24 @@  sw_manifest_toolchain_host() {
 sw_manifest_toolchain_target() {
     opkg_dir="${IMAGE_ROOTFS}/${TISDK_TOOLCHAIN_PATH}/sysroots/${ARMPKGARCH}*-linux*/var/lib/opkg/info"
 
-    sw_manifest_table_header "GPLv3 Development Libraries Installed on Host" "This table describes GPLv3 software libraries and headers that are installed on the development host and used during the development of software to run on the target. Customers should be careful when linking against these libraries to make sure they are complying with the license(s) of the library"
+    sw_manifest_table_header "GPL-3.0 Development Libraries Installed on Host" "This table describes GPL-3.0 software libraries and headers that are installed on the development host and used during the development of software to run on the target. Customers should be careful when linking against these libraries to make sure they are complying with the license(s) of the library"
 
     generate_sw_manifest_table $opkg_dir "true"
 
     sw_manifest_table_footer
 
-    sw_manifest_table_header "Development Libraries Installed on Host" "This table describes software libraries and headers that are installed on the development host and used during the development of software to run on the target.  Some of this software may be licensed under GPLv3.  Customers should be careful when linking against these libraries to make sure they are complying with the license(s) of the library"
+    sw_manifest_table_header "Development Libraries Installed on Host" "This table describes software libraries and headers that are installed on the development host and used during the development of software to run on the target.  Some of this software may be licensed under GPL-3.0.  Customers should be careful when linking against these libraries to make sure they are complying with the license(s) of the library"
 
     generate_sw_manifest_table $opkg_dir
 
     sw_manifest_table_footer
 }
 
-# Create the table of GPLv3 components found in the target file system
+# Create the table of GPL-3.0 components found in the target file system
 sw_manifest_target_gplv3() {
     opkg_dir="$1"
 
-    sw_manifest_table_header "GPLv3 Target Device Content" "This table describes any GPLv3 software being delivered that is expected to run on the target device."
+    sw_manifest_table_header "GPL-3.0 Target Device Content" "This table describes any GPL-3.0 software being delivered that is expected to run on the target device."
 
     generate_sw_manifest_table $opkg_dir "true"
 
@@ -484,8 +484,8 @@  get_sources_from_recipe(){
 # This function expects to be passed the following parameter
 #   - The location to the opkg info directory containing the control files
 #     of the installed packages
-# Optionally if the second parameter is set to true then only GPLv3 contents
-# will be listed.  This is for TI SW Manifests where GPLv3 content is
+# Optionally if the second parameter is set to true then only GPL-3.0 contents
+# will be listed.  This is for TI SW Manifests where GPL-3.0 content is
 # highlighted as a separate table.
 generate_sw_manifest_table() {
     control_dir="$1"
@@ -587,10 +587,10 @@  EOF
         sources="`get_sources_from_recipe $recipe`"
         location="$package""_""$long_version""_""$architecture"".ipk"
 
-        # Set the highlight color if the license in GPLv3.  If this is
-        # a GPLv3 only table then skip this package.
+        # Set the highlight color if the license in GPL-3.0.  If this is
+        # a GPL-3.0 only table then skip this package.
         case "$license" in
-            *GPLv3*)
+            *GPL-3.0*)
                 highlight="bgcolor=yellow" ;;
             *unknown*)
                 if [ "$gplv3_only" != "true" ]