On Wed, Aug 9, 2023 at 10:19 AM Max Krummenacher via
lists.openembedded.org <max.oss.09=gmail....@lists.openembedded.org>
wrote:
>
> From: Max Krummenacher <max.krummenac...@toradex.com>
>
> The current implementation expects the license file in NO_GENERIC_LICENSE
> specified as being relative to ${S}.
> Assuming that there are two source locations this gets confusing to
> specify, e.g. ${WORKDIR}/other_tree/file looks more natural than
> ${S}/../other_tree/file.
>
> Check if the filename specified is not absolute and only then assume
> it is relative to ${S}.
>
> Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
> ---
> meta/classes/create-spdx-2.2.bbclass | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/create-spdx-2.2.bbclass
> b/meta/classes/create-spdx-2.2.bbclass
> index 844b674f6f..42d4ef54b0 100644
> --- a/meta/classes/create-spdx-2.2.bbclass
> +++ b/meta/classes/create-spdx-2.2.bbclass
> @@ -134,7 +134,8 @@ def convert_license_to_spdx(lic, document, d,
> existing={}):
> # If it's not SPDX or PD, then NO_GENERIC_LICENSE must be set
> filename = d.getVarFlag('NO_GENERIC_LICENSE', name)
> if filename:
> - filename = d.expand("${S}/" + filename)
> + if not Path(filename).is_absolute():
> + filename = d.expand("${S}/" + filename)
> with open(filename, errors="replace") as f:
> extracted_info.extractedText = f.read()
> else:
> --
> 2.35.3
>
>
>
>
Gentle ping.
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190257):
https://lists.openembedded.org/g/openembedded-core/message/190257
Mute This Topic: https://lists.openembedded.org/mt/102439593/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
