diff mbox series

[master,v3] k3r5.conf: adjust SPDX_DEPLOY_SBOM_NAME to avoid clash

Message ID 20261115195411.4926-1-denis@denix.org
State New
Headers show
Series [master,v3] k3r5.conf: adjust SPDX_DEPLOY_SBOM_NAME to avoid clash | expand

Commit Message

Denys Dmytriyenko Nov. 15, 2026, 7:54 p.m. UTC
From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>

When the same recipe deploys something in both multiconfigs (default
and k3r5), the corresponding SBOM SPDX files will clash inside our
common TI_COMMON_DEPLOY/images/MAINMACHINE. Let's name them uniquely.

Also, deploy the SBOM SPDX files into its own sbom/ subdirectory in
TI_COMMON_DEPLOY/images/MAINMACHINE.

Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
---
v3 - add guard to fix yocto-check-layer

 meta-ti-bsp/conf/layer.conf            | 1 +
 meta-ti-bsp/conf/multiconfig/k3r5.conf | 1 +
 2 files changed, 2 insertions(+)

Comments

PRC Automation Nov. 15, 2026, 8:07 p.m. UTC | #1
meta-ti / na / 20261115195411.4926-1-denis

PRC Results: PASS

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [master][PATCH v3] k3r5.conf: adjust SPDX_DEPLOY_SBOM_NAME to avoid clash
    WARN: Revised patch missing a comment. (REVISION-1)
        patch
    
    WARN: Missing Signed-off-by by sender in commit message. (SIGNED-OFF-BY-2)
        patch
    
    For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887



=========================================================
  apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [master][PATCH v3] k3r5.conf: adjust SPDX_DEPLOY_SBOM_NAME to avoid clash
- Submitter: From: Denys Dmytriyenko <denis@denix.org>
From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>
- Date: Date: Sun, 15 Nov 2026 14:54:11 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: a224aac7101324c5328f303c3953664091f95369

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202610262200
- Commit SHA: 9132d7b6b3ed4b6aaf9bef79ea0e12bf8cff5fe3

Patches
----------------------------------------
All patches applied



=========================================================
  check-yocto-repo: PASS
=========================================================
master
=====================
PASS



=========================================================
  yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed
Ryan Eatmon Nov. 17, 2026, 3:03 p.m. UTC | #2
Ooops.  We promoted before I could get to dropping the v2 and doing the 
v3.  I'll send the fix up patch.


On 11/15/2026 1:54 PM, Denys Dmytriyenko wrote:
> From: "Denys Dmytriyenko (TI)" <denys@konsulko.com>
> 
> When the same recipe deploys something in both multiconfigs (default
> and k3r5), the corresponding SBOM SPDX files will clash inside our
> common TI_COMMON_DEPLOY/images/MAINMACHINE. Let's name them uniquely.
> 
> Also, deploy the SBOM SPDX files into its own sbom/ subdirectory in
> TI_COMMON_DEPLOY/images/MAINMACHINE.
> 
> Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
> ---
> v3 - add guard to fix yocto-check-layer
> 
>   meta-ti-bsp/conf/layer.conf            | 1 +
>   meta-ti-bsp/conf/multiconfig/k3r5.conf | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf
> index c92e927c..97aa97da 100644
> --- a/meta-ti-bsp/conf/layer.conf
> +++ b/meta-ti-bsp/conf/layer.conf
> @@ -44,6 +44,7 @@ DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
>   SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk"
>   PSEUDO_IGNORE_PATHS:append:ti-soc = ",${TI_COMMON_DEPLOY}"
>   BB_BASEHASH_IGNORE_VARS:append:ti-soc = " TI_COMMON_DEPLOY"
> +SPDX_DEPLOY_SBOM_NAME:ti-soc = "sbom/${PN}-deploy-sbom"
>   
>   MIRRORS += " \
>       git://git.ti.com/.* git://github.com/TexasInstruments/BASENAME;protocol=https \
> diff --git a/meta-ti-bsp/conf/multiconfig/k3r5.conf b/meta-ti-bsp/conf/multiconfig/k3r5.conf
> index fd871dca..a995b46e 100644
> --- a/meta-ti-bsp/conf/multiconfig/k3r5.conf
> +++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf
> @@ -8,5 +8,6 @@ TI_TMPDIR_APPEND ?= "-k3r5"
>   TMPDIR:append = "${TI_TMPDIR_APPEND}"
>   
>   SDKPKGSUFFIX = "k3r5-nativesdk"
> +SPDX_DEPLOY_SBOM_NAME = "sbom/${PN}-k3r5-deploy-sbom"
>   
>   EXTRA_OECONF:pn-gcc-cross-${TARGET_ARCH}:append = " --without-headers"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#20550): https://lists.yoctoproject.org/g/meta-ti/message/20550
> Mute This Topic: https://lists.yoctoproject.org/mt/122283296/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf
index c92e927c..97aa97da 100644
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -44,6 +44,7 @@  DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
 SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk"
 PSEUDO_IGNORE_PATHS:append:ti-soc = ",${TI_COMMON_DEPLOY}"
 BB_BASEHASH_IGNORE_VARS:append:ti-soc = " TI_COMMON_DEPLOY"
+SPDX_DEPLOY_SBOM_NAME:ti-soc = "sbom/${PN}-deploy-sbom"
 
 MIRRORS += " \
     git://git.ti.com/.* git://github.com/TexasInstruments/BASENAME;protocol=https \
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5.conf b/meta-ti-bsp/conf/multiconfig/k3r5.conf
index fd871dca..a995b46e 100644
--- a/meta-ti-bsp/conf/multiconfig/k3r5.conf
+++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf
@@ -8,5 +8,6 @@  TI_TMPDIR_APPEND ?= "-k3r5"
 TMPDIR:append = "${TI_TMPDIR_APPEND}"
 
 SDKPKGSUFFIX = "k3r5-nativesdk"
+SPDX_DEPLOY_SBOM_NAME = "sbom/${PN}-k3r5-deploy-sbom"
 
 EXTRA_OECONF:pn-gcc-cross-${TARGET_ARCH}:append = " --without-headers"