From edc44fcf135d13e6c514c329ad4d0538ef8faf77 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 24 Jul 2024 18:39:18 -0500 Subject: create-spdx-*: Support multilibs via SPDX_MULTILIB_SSTATE_ARCHS When a create-spdx-* classes is processing documents, it needs to find the document in a path that is related to the SSTATE_ARCH when a packge is generated. The SSTATE_ARCH can be affected by multilib configurations, resulting is something like armv8a-mlib. When the image (or SDK) is being generated and the components are collected, the system has no knowledge of the multilib arch and will fail to find it, such as: ERROR: meta-toolchain-1.0-r0 do_populate_sdk: No SPDX file found for package libilp32-libgcc-dbg, False sstate:libilp32-libgcc:armv8a-ilp32-mllibilp32-elf:14.1.0:r0:armv8a-ilp32:12: sstate:libilp32-libgcc::14.1.0:r0::12: Adding in the new SPDX_MULTILIB_SSTATE_ARCHS will provide a full set of SSTATE_ARCHS including ones that contain the multilib extension which will allow create-spdx-* to correctly find the document it is looking for. This would also be valuable to any other function doing a similar search through SSTATE_ARCH that may have been extended with multilib configurations. (From OE-Core rev: f1499c36c1054fc90f7b7268cc95285f2eca72f7) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/spdx-common.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/spdx-common.bbclass') diff --git a/meta/classes/spdx-common.bbclass b/meta/classes/spdx-common.bbclass index d3110a9bdb..e1528b6d0b 100644 --- a/meta/classes/spdx-common.bbclass +++ b/meta/classes/spdx-common.bbclass @@ -37,6 +37,8 @@ SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json" SPDX_CUSTOM_ANNOTATION_VARS ??= "" +SPDX_MULTILIB_SSTATE_ARCHS ??= "${SSTATE_ARCHS}" + python() { import oe.spdx_common oe.spdx_common.load_spdx_license_data(d) -- cgit v1.2.3-54-g00ecf