diff options
| author | Daniel Turull <daniel.turull@ericsson.com> | 2025-06-10 17:24:42 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-17 23:38:18 +0100 |
| commit | 33fd6f6e82cf2c9d20a0532d8cfe850280a83051 (patch) | |
| tree | 91084d1320c8a0490f4cbca974b508c6d6eadaf8 /meta | |
| parent | 5132c991e648d9ae8a6701d9da9e80bec65f0d25 (diff) | |
| download | poky-33fd6f6e82cf2c9d20a0532d8cfe850280a83051.tar.gz | |
spdx: add option to include only compiled sources
When SPDX_INCLUDE_COMPILED_SOURCES is enabled, only include the
source code files that are used during compilation.
It uses debugsource information generated during do_package.
This enables an external tool to use the SPDX information to disregard
vulnerabilities that are not compiled.
As example, when used with the default config with linux-yocto, the spdx size is
reduced from 156MB to 61MB.
Tested with bitbake world on oe-core.
CC: Quentin Schulz <quentin.schulz@cherry.de>
CC: Joshua Watt <JPEWhacker@gmail.com>
CC: Peter Marko <peter.marko@siemens.com>
(From OE-Core rev: c6a2f1fca76fae4c3ea471a0c63d0b453beea968)
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/create-spdx-2.2.bbclass | 9 | ||||
| -rw-r--r-- | meta/classes/spdx-common.bbclass | 3 | ||||
| -rw-r--r-- | meta/lib/oe/spdx30_tasks.py | 10 | ||||
| -rw-r--r-- | meta/lib/oe/spdx_common.py | 41 |
4 files changed, 63 insertions, 0 deletions
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 7e8f8b9ff5..6fc60a1d97 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass | |||
| @@ -137,6 +137,11 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv | |||
| 137 | spdx_files = [] | 137 | spdx_files = [] |
| 138 | 138 | ||
| 139 | file_counter = 1 | 139 | file_counter = 1 |
| 140 | |||
| 141 | check_compiled_sources = d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1" | ||
| 142 | if check_compiled_sources: | ||
| 143 | compiled_sources, types = oe.spdx_common.get_compiled_sources(d) | ||
| 144 | bb.debug(1, f"Total compiled files: {len(compiled_sources)}") | ||
| 140 | for subdir, dirs, files in os.walk(topdir): | 145 | for subdir, dirs, files in os.walk(topdir): |
| 141 | dirs[:] = [d for d in dirs if d not in ignore_dirs] | 146 | dirs[:] = [d for d in dirs if d not in ignore_dirs] |
| 142 | if subdir == str(topdir): | 147 | if subdir == str(topdir): |
| @@ -147,6 +152,10 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv | |||
| 147 | filename = str(filepath.relative_to(topdir)) | 152 | filename = str(filepath.relative_to(topdir)) |
| 148 | 153 | ||
| 149 | if not filepath.is_symlink() and filepath.is_file(): | 154 | if not filepath.is_symlink() and filepath.is_file(): |
| 155 | # Check if file is compiled | ||
| 156 | if check_compiled_sources: | ||
| 157 | if not oe.spdx_common.is_compiled_source(filename, compiled_sources, types): | ||
| 158 | continue | ||
| 150 | spdx_file = oe.spdx.SPDXFile() | 159 | spdx_file = oe.spdx.SPDXFile() |
| 151 | spdx_file.SPDXID = get_spdxid(file_counter) | 160 | spdx_file.SPDXID = get_spdxid(file_counter) |
| 152 | for t in get_types(filepath): | 161 | for t in get_types(filepath): |
diff --git a/meta/classes/spdx-common.bbclass b/meta/classes/spdx-common.bbclass index 713a7fc651..ca0416d1c7 100644 --- a/meta/classes/spdx-common.bbclass +++ b/meta/classes/spdx-common.bbclass | |||
| @@ -26,6 +26,7 @@ SPDX_TOOL_VERSION ??= "1.0" | |||
| 26 | SPDXRUNTIMEDEPLOY = "${SPDXDIR}/runtime-deploy" | 26 | SPDXRUNTIMEDEPLOY = "${SPDXDIR}/runtime-deploy" |
| 27 | 27 | ||
| 28 | SPDX_INCLUDE_SOURCES ??= "0" | 28 | SPDX_INCLUDE_SOURCES ??= "0" |
| 29 | SPDX_INCLUDE_COMPILED_SOURCES ??= "0" | ||
| 29 | 30 | ||
| 30 | SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" | 31 | SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" |
| 31 | SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdocs" | 32 | SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdocs" |
| @@ -40,6 +41,8 @@ SPDX_MULTILIB_SSTATE_ARCHS ??= "${SSTATE_ARCHS}" | |||
| 40 | python () { | 41 | python () { |
| 41 | from oe.cve_check import extend_cve_status | 42 | from oe.cve_check import extend_cve_status |
| 42 | extend_cve_status(d) | 43 | extend_cve_status(d) |
| 44 | if d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1": | ||
| 45 | d.setVar("SPDX_INCLUDE_SOURCES", "1") | ||
| 43 | } | 46 | } |
| 44 | 47 | ||
| 45 | def create_spdx_source_deps(d): | 48 | def create_spdx_source_deps(d): |
diff --git a/meta/lib/oe/spdx30_tasks.py b/meta/lib/oe/spdx30_tasks.py index 61d7ba45e3..beeafc2bb7 100644 --- a/meta/lib/oe/spdx30_tasks.py +++ b/meta/lib/oe/spdx30_tasks.py | |||
| @@ -156,6 +156,11 @@ def add_package_files( | |||
| 156 | bb.note(f"Skip {topdir}") | 156 | bb.note(f"Skip {topdir}") |
| 157 | return spdx_files | 157 | return spdx_files |
| 158 | 158 | ||
| 159 | check_compiled_sources = d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1" | ||
| 160 | if check_compiled_sources: | ||
| 161 | compiled_sources, types = oe.spdx_common.get_compiled_sources(d) | ||
| 162 | bb.debug(1, f"Total compiled files: {len(compiled_sources)}") | ||
| 163 | |||
| 159 | for subdir, dirs, files in os.walk(topdir, onerror=walk_error): | 164 | for subdir, dirs, files in os.walk(topdir, onerror=walk_error): |
| 160 | dirs[:] = [d for d in dirs if d not in ignore_dirs] | 165 | dirs[:] = [d for d in dirs if d not in ignore_dirs] |
| 161 | if subdir == str(topdir): | 166 | if subdir == str(topdir): |
| @@ -171,6 +176,11 @@ def add_package_files( | |||
| 171 | filename = str(filepath.relative_to(topdir)) | 176 | filename = str(filepath.relative_to(topdir)) |
| 172 | file_purposes = get_purposes(filepath) | 177 | file_purposes = get_purposes(filepath) |
| 173 | 178 | ||
| 179 | # Check if file is compiled | ||
| 180 | if check_compiled_sources: | ||
| 181 | if not oe.spdx_common.is_compiled_source(filename, compiled_sources, types): | ||
| 182 | continue | ||
| 183 | |||
| 174 | spdx_file = objset.new_file( | 184 | spdx_file = objset.new_file( |
| 175 | get_spdxid(file_counter), | 185 | get_spdxid(file_counter), |
| 176 | filename, | 186 | filename, |
diff --git a/meta/lib/oe/spdx_common.py b/meta/lib/oe/spdx_common.py index 4caefc7673..c2dec65563 100644 --- a/meta/lib/oe/spdx_common.py +++ b/meta/lib/oe/spdx_common.py | |||
| @@ -242,3 +242,44 @@ def fetch_data_to_uri(fd, name): | |||
| 242 | uri = uri + "@" + fd.revision | 242 | uri = uri + "@" + fd.revision |
| 243 | 243 | ||
| 244 | return uri | 244 | return uri |
| 245 | |||
| 246 | def is_compiled_source (filename, compiled_sources, types): | ||
| 247 | """ | ||
| 248 | Check if the file is a compiled file | ||
| 249 | """ | ||
| 250 | import os | ||
| 251 | # If we don't have compiled source, we assume all are compiled. | ||
| 252 | if not compiled_sources: | ||
| 253 | return True | ||
| 254 | |||
| 255 | # We return always true if the file type is not in the list of compiled files. | ||
| 256 | # Some files in the source directory are not compiled, for example, Makefiles, | ||
| 257 | # but also python .py file. We need to include them in the SPDX. | ||
| 258 | basename = os.path.basename(filename) | ||
| 259 | ext = basename.partition(".")[2] | ||
| 260 | if ext not in types: | ||
| 261 | return True | ||
| 262 | # Check that the file is in the list | ||
| 263 | return filename in compiled_sources | ||
| 264 | |||
| 265 | def get_compiled_sources(d): | ||
| 266 | """ | ||
| 267 | Get list of compiled sources from debug information and normalize the paths | ||
| 268 | """ | ||
| 269 | import itertools | ||
| 270 | source_info = oe.package.read_debugsources_info(d) | ||
| 271 | if not source_info: | ||
| 272 | bb.debug(1, "Do not have debugsources.list. Skipping") | ||
| 273 | return [], [] | ||
| 274 | |||
| 275 | # Sources are not split now in SPDX, so we aggregate them | ||
| 276 | sources = set(itertools.chain.from_iterable(source_info.values())) | ||
| 277 | # Check extensions of files | ||
| 278 | types = set() | ||
| 279 | for src in sources: | ||
| 280 | basename = os.path.basename(src) | ||
| 281 | ext = basename.partition(".")[2] | ||
| 282 | if ext not in types and ext: | ||
| 283 | types.add(ext) | ||
| 284 | bb.debug(1, f"Num of sources: {len(sources)} and types: {len(types)} {str(types)}") | ||
| 285 | return sources, types | ||
