summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2023-09-22 22:20:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-26 10:25:42 +0100
commitfc59af1998af4347c5992f01231291557bc8f3cd (patch)
tree648bdc3f4bdb9e6eb657b1fab0d7f112f866a307 /meta/classes
parent593edfa2ae342c9ef4f42c1cb64b7642ddbc4cb6 (diff)
downloadpoky-fc59af1998af4347c5992f01231291557bc8f3cd.tar.gz
spdx: use TOOLCHAIN_OUTPUTNAME for SDK filename prefix
Replace SDK_NAME with TOOLCHAIN_OUTPUTNAME when naming SDK host and target SPDX archives. In most cases TOOLCHAIN_OUTPUTNAME is almost identical to SDK_NAME, but sometimes custom meta-toolchain recipes have some variations and populate_sdk_base.bbclass already uses TOOLCHAIN_OUTPUTNAME to name corresponding host and target manifests: SDK_HOST_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.host.manifest" SDK_TARGET_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.target.manifest" To match the naming convention, also use TOOLCHAIN_OUTPUTNAME here for naming SPDX archives as well, resulting in: ${TOOLCHAIN_OUTPUTNAME}-host.spdx.tar.zst ${TOOLCHAIN_OUTPUTNAME}-target.spdx.tar.zst (From OE-Core rev: 38158670256e2ce803aa45f609108d29523b3135) Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Denys Dmytriyenko <denis@denix.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/create-spdx-2.2.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass
index a2b96da61a..885f07a1f8 100644
--- a/meta/classes/create-spdx-2.2.bbclass
+++ b/meta/classes/create-spdx-2.2.bbclass
@@ -986,7 +986,7 @@ def sdk_combine_spdx(d, sdk_type):
986 from pathlib import Path 986 from pathlib import Path
987 from oe.sdk import sdk_list_installed_packages 987 from oe.sdk import sdk_list_installed_packages
988 988
989 sdk_name = d.getVar("SDK_NAME") + "-" + sdk_type 989 sdk_name = d.getVar("TOOLCHAIN_OUTPUTNAME") + "-" + sdk_type
990 sdk_deploydir = Path(d.getVar("SDKDEPLOYDIR")) 990 sdk_deploydir = Path(d.getVar("SDKDEPLOYDIR"))
991 sdk_spdxid = oe.sbom.get_sdk_spdxid(sdk_name) 991 sdk_spdxid = oe.sbom.get_sdk_spdxid(sdk_name)
992 sdk_packages = sdk_list_installed_packages(d, sdk_type == "target") 992 sdk_packages = sdk_list_installed_packages(d, sdk_type == "target")