diff options
| author | Saul Wold <Saul.Wold@windriver.com> | 2022-01-12 09:20:39 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-13 13:57:26 +0000 |
| commit | f73e636b0a385dd55c13be33c7fba960fa4da322 (patch) | |
| tree | 30196ea2e1afd194f59d3d038b82770665c5b0db /meta/classes/create-spdx.bbclass | |
| parent | d756b346f248df47b0540644adb1d0f17bcc4b6e (diff) | |
| download | poky-f73e636b0a385dd55c13be33c7fba960fa4da322.tar.gz | |
create-spdx: Add kernel work-shared source
Since the kernel source is stored in work-shared, we need to add it
to the search path so the kernel and kernel-modules source code can
be found correctly.
(From OE-Core rev: 93a94890b9f2679945e96973937b209aa12302b7)
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/create-spdx.bbclass')
| -rw-r--r-- | meta/classes/create-spdx.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index e44a204a8f..eb9535069a 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass | |||
| @@ -254,6 +254,7 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag | |||
| 254 | Path(d.getVar('PKGD')), | 254 | Path(d.getVar('PKGD')), |
| 255 | Path(d.getVar('STAGING_DIR_TARGET')), | 255 | Path(d.getVar('STAGING_DIR_TARGET')), |
| 256 | Path(d.getVar('STAGING_DIR_NATIVE')), | 256 | Path(d.getVar('STAGING_DIR_NATIVE')), |
| 257 | Path(d.getVar('STAGING_KERNEL_DIR')), | ||
| 257 | ] | 258 | ] |
| 258 | 259 | ||
| 259 | pkg_data = oe.packagedata.read_subpkgdata_extended(package, d) | 260 | pkg_data = oe.packagedata.read_subpkgdata_extended(package, d) |
| @@ -275,7 +276,10 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag | |||
| 275 | for debugsrc in file_data["debugsrc"]: | 276 | for debugsrc in file_data["debugsrc"]: |
| 276 | ref_id = "NOASSERTION" | 277 | ref_id = "NOASSERTION" |
| 277 | for search in debug_search_paths: | 278 | for search in debug_search_paths: |
| 278 | debugsrc_path = search / debugsrc.lstrip("/") | 279 | if debugsrc.startswith("/usr/src/kernel"): |
| 280 | debugsrc_path = search / debugsrc.replace('/usr/src/kernel/', '') | ||
| 281 | else: | ||
| 282 | debugsrc_path = search / debugsrc.lstrip("/") | ||
| 279 | if not debugsrc_path.exists(): | 283 | if not debugsrc_path.exists(): |
| 280 | continue | 284 | continue |
| 281 | 285 | ||
