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/lib | |
| 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/lib')
| -rw-r--r-- | meta/lib/oe/sbom30.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/sbom30.py b/meta/lib/oe/sbom30.py index 2532d19dad..27ed74f810 100644 --- a/meta/lib/oe/sbom30.py +++ b/meta/lib/oe/sbom30.py | |||
| @@ -921,7 +921,7 @@ def load_jsonld_by_arch(d, arch, subdir, name, *, required=False): | |||
| 921 | 921 | ||
| 922 | 922 | ||
| 923 | def find_jsonld(d, subdir, name, *, required=False): | 923 | def find_jsonld(d, subdir, name, *, required=False): |
| 924 | package_archs = d.getVar("SSTATE_ARCHS").split() | 924 | package_archs = d.getVar("SPDX_MULTILIB_SSTATE_ARCHS").split() |
| 925 | package_archs.reverse() | 925 | package_archs.reverse() |
| 926 | 926 | ||
| 927 | for arch in package_archs: | 927 | for arch in package_archs: |
