From 75922d42b0dbb02158583b1ba7c8137c4831207b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Nov 2025 14:14:43 +0100 Subject: [PATCH] selftest/spdx: Fix for SPDX_VERSION addition Update the test for the addition of SPDX_VERSION to the deploy path. (From OE-Core rev: d75bfbaf69292f80cacc5b8d6cbff03418a34ebc) Signed-off-by: Richard Purdie (cherry picked from commit 055e8c21908127722abad9e992d6408d8697a119) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/spdx.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/spdx.py b/meta/lib/oeqa/selftest/cases/spdx.py index 05fc4e390b..7685a81e7f 100644 --- a/meta/lib/oeqa/selftest/cases/spdx.py +++ b/meta/lib/oeqa/selftest/cases/spdx.py @@ -25,10 +25,11 @@ INHERIT += "create-spdx" deploy_dir = get_bb_var("DEPLOY_DIR") machine_var = get_bb_var("MACHINE") + spdx_version = get_bb_var("SPDX_VERSION") # qemux86-64 creates the directory qemux86_64 machine_dir = machine_var.replace("-", "_") - full_file_path = os.path.join(deploy_dir, "spdx", machine_dir, high_level_dir, spdx_file) + full_file_path = os.path.join(deploy_dir, "spdx", spdx_version, machine_dir, high_level_dir, spdx_file) try: os.remove(full_file_path)