| Message ID | 20220727170918.6960-1-mihai.lindner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | create-spdx: Fix supplier field | expand |
On 7/27/22 12:09, Mihai Lindner wrote: > The correct field name is "supplier" according to SPDX schema. > The "supplier" field translates to "PackageSupplier", but that's for > tag-value format. LGTM, Thanks. Reviewed-by: Joshua Watt <JPEWhacker@gmail.com> > > Signed-off-by: Mihai Lindner <mihai.lindner@gmail.com> > --- > meta/classes/create-spdx.bbclass | 6 +++--- > 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() { > recipe.name = d.getVar("PN") > recipe.versionInfo = d.getVar("PV") > recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) > - recipe.packageSupplier = d.getVar("SPDX_SUPPLIER") > + recipe.supplier = d.getVar("SPDX_SUPPLIER") > if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): > recipe.annotations.append(create_annotation(d, "isNative")) > > @@ -561,7 +561,7 @@ python do_create_spdx() { > spdx_package.name = pkg_name > spdx_package.versionInfo = d.getVar("PV") > spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) > - spdx_package.packageSupplier = d.getVar("SPDX_SUPPLIER") > + spdx_package.supplier = d.getVar("SPDX_SUPPLIER") > > package_doc.packages.append(spdx_package) > > @@ -901,7 +901,7 @@ def combine_spdx(d, rootfs_name, rootfs_deploydir, rootfs_spdxid, packages): > image.name = d.getVar("PN") > image.versionInfo = d.getVar("PV") > image.SPDXID = rootfs_spdxid > - image.packageSupplier = d.getVar("SPDX_SUPPLIER") > + image.supplier = d.getVar("SPDX_SUPPLIER") > > doc.packages.append(image) > > 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): > SPDXID = _String() > versionInfo = _String() > downloadLocation = _String(default="NOASSERTION") > - packageSupplier = _String(default="NOASSERTION") > + supplier = _String(default="NOASSERTION") > homepage = _String() > licenseConcluded = _String(default="NOASSERTION") > licenseDeclared = _String(default="NOASSERTION")
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() { recipe.name = d.getVar("PN") recipe.versionInfo = d.getVar("PV") recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) - recipe.packageSupplier = d.getVar("SPDX_SUPPLIER") + recipe.supplier = d.getVar("SPDX_SUPPLIER") if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): recipe.annotations.append(create_annotation(d, "isNative")) @@ -561,7 +561,7 @@ python do_create_spdx() { spdx_package.name = pkg_name spdx_package.versionInfo = d.getVar("PV") spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) - spdx_package.packageSupplier = d.getVar("SPDX_SUPPLIER") + spdx_package.supplier = d.getVar("SPDX_SUPPLIER") package_doc.packages.append(spdx_package) @@ -901,7 +901,7 @@ def combine_spdx(d, rootfs_name, rootfs_deploydir, rootfs_spdxid, packages): image.name = d.getVar("PN") image.versionInfo = d.getVar("PV") image.SPDXID = rootfs_spdxid - image.packageSupplier = d.getVar("SPDX_SUPPLIER") + image.supplier = d.getVar("SPDX_SUPPLIER") doc.packages.append(image) 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): SPDXID = _String() versionInfo = _String() downloadLocation = _String(default="NOASSERTION") - packageSupplier = _String(default="NOASSERTION") + supplier = _String(default="NOASSERTION") homepage = _String() licenseConcluded = _String(default="NOASSERTION") licenseDeclared = _String(default="NOASSERTION")
The correct field name is "supplier" according to SPDX schema. The "supplier" field translates to "PackageSupplier", but that's for tag-value format. Signed-off-by: Mihai Lindner <mihai.lindner@gmail.com> --- meta/classes/create-spdx.bbclass | 6 +++--- meta/lib/oe/spdx.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)