diff options
| -rw-r--r-- | meta/classes/create-spdx.bbclass | 6 | ||||
| -rw-r--r-- | meta/lib/oe/spdx.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 37b6b569a1..f6827fccf7 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass | |||
| @@ -445,7 +445,7 @@ python do_create_spdx() { | |||
| 445 | recipe.name = d.getVar("PN") | 445 | recipe.name = d.getVar("PN") |
| 446 | recipe.versionInfo = d.getVar("PV") | 446 | recipe.versionInfo = d.getVar("PV") |
| 447 | recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) | 447 | recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) |
| 448 | recipe.packageSupplier = d.getVar("SPDX_SUPPLIER") | 448 | recipe.supplier = d.getVar("SPDX_SUPPLIER") |
| 449 | if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): | 449 | if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): |
| 450 | recipe.annotations.append(create_annotation(d, "isNative")) | 450 | recipe.annotations.append(create_annotation(d, "isNative")) |
| 451 | 451 | ||
| @@ -555,7 +555,7 @@ python do_create_spdx() { | |||
| 555 | spdx_package.name = pkg_name | 555 | spdx_package.name = pkg_name |
| 556 | spdx_package.versionInfo = d.getVar("PV") | 556 | spdx_package.versionInfo = d.getVar("PV") |
| 557 | spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) | 557 | spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) |
| 558 | spdx_package.packageSupplier = d.getVar("SPDX_SUPPLIER") | 558 | spdx_package.supplier = d.getVar("SPDX_SUPPLIER") |
| 559 | 559 | ||
| 560 | package_doc.packages.append(spdx_package) | 560 | package_doc.packages.append(spdx_package) |
| 561 | 561 | ||
| @@ -895,7 +895,7 @@ def combine_spdx(d, rootfs_name, rootfs_deploydir, rootfs_spdxid, packages): | |||
| 895 | image.name = d.getVar("PN") | 895 | image.name = d.getVar("PN") |
| 896 | image.versionInfo = d.getVar("PV") | 896 | image.versionInfo = d.getVar("PV") |
| 897 | image.SPDXID = rootfs_spdxid | 897 | image.SPDXID = rootfs_spdxid |
| 898 | image.packageSupplier = d.getVar("SPDX_SUPPLIER") | 898 | image.supplier = d.getVar("SPDX_SUPPLIER") |
| 899 | 899 | ||
| 900 | doc.packages.append(image) | 900 | doc.packages.append(image) |
| 901 | 901 | ||
diff --git a/meta/lib/oe/spdx.py b/meta/lib/oe/spdx.py index 14ca706895..6d56ed90df 100644 --- a/meta/lib/oe/spdx.py +++ b/meta/lib/oe/spdx.py | |||
| @@ -218,7 +218,7 @@ class SPDXPackage(SPDXObject): | |||
| 218 | SPDXID = _String() | 218 | SPDXID = _String() |
| 219 | versionInfo = _String() | 219 | versionInfo = _String() |
| 220 | downloadLocation = _String(default="NOASSERTION") | 220 | downloadLocation = _String(default="NOASSERTION") |
| 221 | packageSupplier = _String(default="NOASSERTION") | 221 | supplier = _String(default="NOASSERTION") |
| 222 | homepage = _String() | 222 | homepage = _String() |
| 223 | licenseConcluded = _String(default="NOASSERTION") | 223 | licenseConcluded = _String(default="NOASSERTION") |
| 224 | licenseDeclared = _String(default="NOASSERTION") | 224 | licenseDeclared = _String(default="NOASSERTION") |
