From: <daniel.turull@ericsson.com>
To: <openembedded-core@lists.openembedded.org>
Cc: Daniel Turull <daniel.turull@ericsson.com>,
Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>,
Joshua Watt <JPEWhacker@gmail.com>
Subject: [scarthgap][PATCH 2/2] spdx: add option to include only compiled sources
Date: Thu, 19 Jun 2025 10:47:36 +0200 [thread overview]
Message-ID: <20250619084736.1940747-2-daniel.turull@ericsson.com> (raw)
In-Reply-To: <20250619084736.1940747-1-daniel.turull@ericsson.com>
From: Daniel Turull <daniel.turull@ericsson.com>
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.
(From OE-Core rev: c6a2f1fca76fae4c3ea471a0c63d0b453beea968)
Adapted to existing files for create-spdx-2.2
CC: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
CC: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
meta/classes/create-spdx-2.2.bbclass | 12 ++++++++
meta/lib/oe/spdx.py | 42 ++++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass
index ade1a04be3..1fc11ad7ac 100644
--- a/meta/classes/create-spdx-2.2.bbclass
+++ b/meta/classes/create-spdx-2.2.bbclass
@@ -100,6 +100,9 @@ python() {
# Transform the license array to a dictionary
data["licenses"] = {l["licenseId"]: l for l in data["licenses"]}
d.setVar("SPDX_LICENSE_DATA", data)
+
+ if d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1":
+ d.setVar("SPDX_INCLUDE_SOURCES", "1")
}
def convert_license_to_spdx(lic, document, d, existing={}):
@@ -215,6 +218,11 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv
spdx_files = []
file_counter = 1
+
+ check_compiled_sources = d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1"
+ if check_compiled_sources:
+ compiled_sources, types = oe.spdx.get_compiled_sources(d)
+ bb.debug(1, f"Total compiled files: {len(compiled_sources)}")
for subdir, dirs, files in os.walk(topdir):
dirs[:] = [d for d in dirs if d not in ignore_dirs]
if subdir == str(topdir):
@@ -225,6 +233,10 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv
filename = str(filepath.relative_to(topdir))
if not filepath.is_symlink() and filepath.is_file():
+ # Check if file is compiled
+ if check_compiled_sources:
+ if not oe.spdx.is_compiled_source(filename, compiled_sources, types):
+ continue
spdx_file = oe.spdx.SPDXFile()
spdx_file.SPDXID = get_spdxid(file_counter)
for t in get_types(filepath):
diff --git a/meta/lib/oe/spdx.py b/meta/lib/oe/spdx.py
index 7aaf2af5ed..92dcd2da05 100644
--- a/meta/lib/oe/spdx.py
+++ b/meta/lib/oe/spdx.py
@@ -355,3 +355,45 @@ class SPDXDocument(SPDXObject):
if r.spdxDocument == namespace:
return r
return None
+
+def is_compiled_source (filename, compiled_sources, types):
+ """
+ Check if the file is a compiled file
+ """
+ import os
+ # If we don't have compiled source, we assume all are compiled.
+ if not compiled_sources:
+ return True
+
+ # We return always true if the file type is not in the list of compiled files.
+ # Some files in the source directory are not compiled, for example, Makefiles,
+ # but also python .py file. We need to include them in the SPDX.
+ basename = os.path.basename(filename)
+ ext = basename.partition(".")[2]
+ if ext not in types:
+ return True
+ # Check that the file is in the list
+ return filename in compiled_sources
+
+def get_compiled_sources(d):
+ """
+ Get list of compiled sources from debug information and normalize the paths
+ """
+ import itertools
+ import oe.package
+ source_info = oe.package.read_debugsources_info(d)
+ if not source_info:
+ bb.debug(1, "Do not have debugsources.list. Skipping")
+ return [], []
+
+ # Sources are not split now in SPDX, so we aggregate them
+ sources = set(itertools.chain.from_iterable(source_info.values()))
+ # Check extensions of files
+ types = set()
+ for src in sources:
+ basename = os.path.basename(src)
+ ext = basename.partition(".")[2]
+ if ext not in types and ext:
+ types.add(ext)
+ bb.debug(1, f"Num of sources: {len(sources)} and types: {len(types)} {str(types)}")
+ return sources, types
next prev parent reply other threads:[~2025-06-19 8:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-19 8:47 [scarthgap][PATCH 1/2] package: export debugsources in PKGDESTWORK as json daniel.turull
2025-06-19 8:47 ` daniel.turull [this message]
2025-06-19 15:23 ` [OE-core] " Steve Sakoman
2025-06-19 15:30 ` Daniel Turull
2025-06-23 21:33 ` Richard Purdie
2025-06-24 7:55 ` Daniel Turull
2025-06-25 15:27 ` Steve Sakoman
2025-06-25 15:30 ` Daniel Turull
2025-06-26 11:37 ` Daniel Turull
2025-06-26 20:13 ` Steve Sakoman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250619084736.1940747-2-daniel.turull@ericsson.com \
--to=daniel.turull@ericsson.com \
--cc=JPEWhacker@gmail.com \
--cc=mathieu.dubois-briand@bootlin.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox