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 15cccac84b..21cd5be3cb 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass | |||
| @@ -451,7 +451,7 @@ python do_create_spdx() { | |||
| 451 | recipe.name = d.getVar("PN") | 451 | recipe.name = d.getVar("PN") |
| 452 | recipe.versionInfo = d.getVar("PV") | 452 | recipe.versionInfo = d.getVar("PV") |
| 453 | recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) | 453 | recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) |
| 454 | recipe.packageSupplier = d.getVar("SPDX_SUPPLIER") | 454 | recipe.supplier = d.getVar("SPDX_SUPPLIER") |
| 455 | if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): | 455 | if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): |
| 456 | recipe.annotations.append(create_annotation(d, "isNative")) | 456 | recipe.annotations.append(create_annotation(d, "isNative")) |
| 457 | 457 | ||
| @@ -561,7 +561,7 @@ python do_create_spdx() { | |||
| 561 | spdx_package.name = pkg_name | 561 | spdx_package.name = pkg_name |
| 562 | spdx_package.versionInfo = d.getVar("PV") | 562 | spdx_package.versionInfo = d.getVar("PV") |
| 563 | spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) | 563 | spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) |
| 564 | spdx_package.packageSupplier = d.getVar("SPDX_SUPPLIER") | 564 | spdx_package.supplier = d.getVar("SPDX_SUPPLIER") |
| 565 | 565 | ||
| 566 | package_doc.packages.append(spdx_package) | 566 | package_doc.packages.append(spdx_package) |
| 567 | 567 | ||
| @@ -901,7 +901,7 @@ def combine_spdx(d, rootfs_name, rootfs_deploydir, rootfs_spdxid, packages): | |||
| 901 | image.name = d.getVar("PN") | 901 | image.name = d.getVar("PN") |
| 902 | image.versionInfo = d.getVar("PV") | 902 | image.versionInfo = d.getVar("PV") |
| 903 | image.SPDXID = rootfs_spdxid | 903 | image.SPDXID = rootfs_spdxid |
| 904 | image.packageSupplier = d.getVar("SPDX_SUPPLIER") | 904 | image.supplier = d.getVar("SPDX_SUPPLIER") |
| 905 | 905 | ||
| 906 | doc.packages.append(image) | 906 | doc.packages.append(image) |
| 907 | 907 | ||
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") |
