From: hongxu Date: Wed, 25 Dec 2024 02:48:25 +0000 (-0800) Subject: meta/lib/oe/sbom30.py: correct alias X-Git-Tag: yocto-5.2~833 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=708cbf00d46169ca05660b1f9f3e0653b499e9ef;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git meta/lib/oe/sbom30.py: correct alias After commit [spdx 3.0: Rework how SPDX aliases are linked] applied, it added extra "/" to namespace, which causing the replacement of UNIHASH missing a "/" http://spdxdocs.org/openembedded-alias/by-doc-hash/0b308e4b9ad979f642d8787c61f76c31bdcad04837eeaaf8bc383f33f99bbeb8/flex-nativeUNIHASH/build/recipe After applying this commit to remove "/" from namespace. http://spdxdocs.org/openembedded-alias/by-doc-hash/0b308e4b9ad979f642d8787c61f76c31bdcad04837eeaaf8bc383f33f99bbeb8/flex-native/UNIHASH/build/recipe Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/sbom30.py b/meta/lib/oe/sbom30.py index 29cb9e45ad5..08fea2aca3b 100644 --- a/meta/lib/oe/sbom30.py +++ b/meta/lib/oe/sbom30.py @@ -267,7 +267,7 @@ class ObjectSet(oe.spdx30.SHACLObjectSet): def new_alias_id(self, obj, replace): unihash = self.d.getVar("BB_UNIHASH") - namespace = self.get_namespace() + "/" + namespace = self.get_namespace() if unihash not in obj._id: bb.warn(f"Unihash {unihash} not found in {obj._id}") return None