From: Mark Hatle Date: Mon, 15 Jul 2024 19:56:06 +0000 (-0500) Subject: create-sdpx-2.2.bbclass: Switch from exists to isfile checking debugsrc X-Git-Tag: uninative-4.6~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02e262c291c0b2066132b4cb2ca5fda8145284a9;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git create-sdpx-2.2.bbclass: Switch from exists to isfile checking debugsrc While debugsrc is almost always a file (or link), there are apparently cases where a directory could be returned from the dwarfsrcfiles processing. When this happens, the hashing fails and an error results when building the SPDX documents. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 865323d66a6..12b78cb3f62 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass @@ -230,7 +230,8 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag debugsrc_path = search / debugsrc.replace('/usr/src/kernel/', '') else: debugsrc_path = search / debugsrc.lstrip("/") - if not debugsrc_path.exists(): + # We can only hash files below, skip directories, links, etc. + if not os.path.isfile(debugsrc_path): continue file_sha256 = bb.utils.sha256_file(debugsrc_path)