diff options
author | Mihai Lindner <mihai.lindner@gmail.com> | 2022-07-27 20:09:18 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-28 14:43:21 +0100 |
commit | 403dfe91ea6d985b6f0533adea2167e36f24e9b2 (patch) | |
tree | 09ce08abd6f9edbfd65bade167c4f105f937b6c0 /meta/classes | |
parent | 48a6d84de10777335f70cfb5836cd1db0f2ff257 (diff) | |
download | poky-403dfe91ea6d985b6f0533adea2167e36f24e9b2.tar.gz |
create-spdx: Fix supplier field
The correct field name is "supplier" according to SPDX schema.
The "supplier" field translates to "PackageSupplier", but that's for
tag-value format.
(From OE-Core rev: ca8db0e0a2860ac1e3f537471fa71b43c3be0a58)
Signed-off-by: Mihai Lindner <mihai.lindner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/create-spdx.bbclass | 6 |
1 files changed, 3 insertions, 3 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 | ||