[2/2] spdx: use TOOLCHAIN_OUTPUTNAME for SDK filename prefix

Replace SDK_NAME with TOOLCHAIN_OUTPUTNAME when naming SDK host and
target SPDX archives.

In most cases TOOLCHAIN_OUTPUTNAME is almost identical to SDK_NAME,
but sometimes custom meta-toolchain recipes have some variations and
populate_sdk_base.bbclass already uses TOOLCHAIN_OUTPUTNAME to name
corresponding host and target manifests:

SDK_HOST_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"
SDK_TARGET_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"

To match the naming convention, also use TOOLCHAIN_OUTPUTNAME here
for naming SPDX archives as well, resulting in:

${TOOLCHAIN_OUTPUTNAME}-host.spdx.tar.zst
${TOOLCHAIN_OUTPUTNAME}-target.spdx.tar.zst

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 meta/classes/create-spdx-2.2.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

On 9/22/2023 5:20 PM, Denys Dmytriyenko wrote:
> Replace SDK_NAME with TOOLCHAIN_OUTPUTNAME when naming SDK host and
> target SPDX archives.
> 
> In most cases TOOLCHAIN_OUTPUTNAME is almost identical to SDK_NAME,
> but sometimes custom meta-toolchain recipes have some variations and
> populate_sdk_base.bbclass already uses TOOLCHAIN_OUTPUTNAME to name
> corresponding host and target manifests:
> 
> SDK_HOST_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"
> SDK_TARGET_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"
> 
> To match the naming convention, also use TOOLCHAIN_OUTPUTNAME here
> for naming SPDX archives as well, resulting in:
> 
> ${TOOLCHAIN_OUTPUTNAME}-host.spdx.tar.zst
> ${TOOLCHAIN_OUTPUTNAME}-target.spdx.tar.zst
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> Signed-off-by: Denys Dmytriyenko <denis@denix.org>

Tested-by: Ryan Eatmon <reatmon@ti.com>

> ---
>   meta/classes/create-spdx-2.2.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass
> index a2b96da61a..885f07a1f8 100644
> --- a/meta/classes/create-spdx-2.2.bbclass
> +++ b/meta/classes/create-spdx-2.2.bbclass
> @@ -986,7 +986,7 @@ def sdk_combine_spdx(d, sdk_type):
>       from pathlib import Path
>       from oe.sdk import sdk_list_installed_packages
>   
> -    sdk_name = d.getVar("SDK_NAME") + "-" + sdk_type
> +    sdk_name = d.getVar("TOOLCHAIN_OUTPUTNAME") + "-" + sdk_type
>       sdk_deploydir = Path(d.getVar("SDKDEPLOYDIR"))
>       sdk_spdxid = oe.sbom.get_sdk_spdxid(sdk_name)
>       sdk_packages = sdk_list_installed_packages(d, sdk_type == "target")
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#188139): https://lists.openembedded.org/g/openembedded-core/message/188139
> Mute This Topic: https://lists.openembedded.org/mt/101531120/6551054
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>