diff options
author | Mark Hatle <mark.hatle@amd.com> | 2024-07-24 18:39:18 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-07-26 12:28:42 +0100 |
commit | edc44fcf135d13e6c514c329ad4d0538ef8faf77 (patch) | |
tree | 9c39c7d0230ee50758dd8fbcd25926c10400ca1d /meta/classes/spdx-common.bbclass | |
parent | 0328f2a585be350eee229dc05c0ed8163b61b47c (diff) | |
download | poky-edc44fcf135d13e6c514c329ad4d0538ef8faf77.tar.gz |
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 <mark.hatle@amd.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/spdx-common.bbclass')
-rw-r--r-- | meta/classes/spdx-common.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
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" | |||
37 | 37 | ||
38 | SPDX_CUSTOM_ANNOTATION_VARS ??= "" | 38 | SPDX_CUSTOM_ANNOTATION_VARS ??= "" |
39 | 39 | ||
40 | SPDX_MULTILIB_SSTATE_ARCHS ??= "${SSTATE_ARCHS}" | ||
41 | |||
40 | python() { | 42 | python() { |
41 | import oe.spdx_common | 43 | import oe.spdx_common |
42 | oe.spdx_common.load_spdx_license_data(d) | 44 | oe.spdx_common.load_spdx_license_data(d) |