From 35c061a4514905b3ebbb7f0633a584927519445c Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Mon, 10 Jun 2024 15:41:49 -0600 Subject: [PATCH] classes/spdx-common: Add SPDX version to path Since multiple versions of SPDX are available, use the version in the path Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/create-spdx-2.2.bbclass | 2 ++ meta/classes/spdx-common.bbclass | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 94a172fbc94..3ebf92b5e12 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass @@ -6,6 +6,8 @@ inherit spdx-common +SPDX_VERSION = "2.2" + def get_namespace(d, name): import uuid namespace_uuid = uuid.uuid5(uuid.NAMESPACE_DNS, d.getVar("SPDX_UUID_NAMESPACE")) diff --git a/meta/classes/spdx-common.bbclass b/meta/classes/spdx-common.bbclass index 468a11ca3e2..f6fc182838d 100644 --- a/meta/classes/spdx-common.bbclass +++ b/meta/classes/spdx-common.bbclass @@ -4,14 +4,15 @@ # SPDX-License-Identifier: GPL-2.0-only # -DEPLOY_DIR_SPDX ??= "${DEPLOY_DIR}/spdx" +SPDX_VERSION ??= "" +DEPLOY_DIR_SPDX ??= "${DEPLOY_DIR}/spdx/${SPDX_VERSION}" # The product name that the CVE database uses. Defaults to BPN, but may need to # be overriden per recipe (for example tiff.bb sets CVE_PRODUCT=libtiff). CVE_PRODUCT ??= "${BPN}" CVE_VERSION ??= "${PV}" -SPDXDIR ??= "${WORKDIR}/spdx" +SPDXDIR ??= "${WORKDIR}/spdx/${SPDX_VERSION}" SPDXDEPLOY = "${SPDXDIR}/deploy" SPDXWORK = "${SPDXDIR}/work" SPDXIMAGEWORK = "${SPDXDIR}/image-work" -- 2.47.2