diff mbox series

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

Message ID 20261113221542.4188789-1-denis@denix.org
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [master,v2] k3r5.conf: adjust SPDX_DEPLOY_SBOM_NAME to avoid clash | expand

Commit Message

Denys Dmytriyenko Nov. 13, 2026, 10:15 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>
---
v2 - deploy SBOM SPDX into subdirectory

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

Comments

PRC Automation Nov. 13, 2026, 10:34 p.m. UTC | #1
meta-ti / na / 20261113221542.4188789-1-denis

PRC Results: FAIL

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [master][PATCH v2] 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 v2] 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: Fri, 13 Nov 2026 17:15:42 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: e8f653269aeef95d8169de840792ec3e7cceabeb

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master-wip
- Commit Author: Denys Dmytriyenko (TI) <denys@konsulko.com>
- Commit Subject: ti-sci-fw: Allow empty SPDX deploy artifacts
- Commit SHA: b3e4f2c6efcc4cca09550f4dfa8d4b87ef5f98f8

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



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



=========================================================
  yocto-check-layers: FAIL
=========================================================
master - FAIL
=====================

ERROR: Signature change for grub-efi
   grub-efi:do_create_deploy_sbom: 59d008dd124946e74481ff4dde44f981ea6de1e21eef20621e9f4b6b54259d18 -> 533a8ec949e1cfbabd18d84fd5f558b7d509d65e5073601c1f235cafd4c2d076
      bitbake-diffsigs --task grub-efi do_create_deploy_sbom --signature 59d008dd124946e74481ff4dde44f981ea6de1e21eef20621e9f4b6b54259d18 533a8ec949e1cfbabd18d84fd5f558b7d509d65e5073601c1f235cafd4c2d076
      NOTE: Reconnecting to bitbake server...
      basehash changed from 0e84486eb7ac14c2614b55fcbc2b091c717ac1e7006c72c7af76117a9d0aaace to 3fd7c7748f48d21afb7b677dc006f3deebd4bb01e474876e765dcd8e52afac62
      Variable SPDX_DEPLOY_SBOM_NAME value changed from '${PN}-deploy-sbom' to 'sbom/${PN}-deploy-sbom'

ERROR: Signature change for meta-ide-support
   meta-ide-support:do_create_deploy_sbom: ed9e0c8fdfeb91fac9fcfdf6cd07901729a48b4eb80006c05fcf71685d569415 -> 2aa0b434a813c6adac9cf94053f6af7ecc0c74d51448b6e82ad9aca1cb0c5a02
      bitbake-diffsigs --task meta-ide-support do_create_deploy_sbom --signature ed9e0c8fdfeb91fac9fcfdf6cd07901729a48b4eb80006c05fcf71685d569415 2aa0b434a813c6adac9cf94053f6af7ecc0c74d51448b6e82ad9aca1cb0c5a02
      NOTE: Reconnecting to bitbake server...
      basehash changed from 0e84486eb7ac14c2614b55fcbc2b091c717ac1e7006c72c7af76117a9d0aaace to 3fd7c7748f48d21afb7b677dc006f3deebd4bb01e474876e765dcd8e52afac62
      Variable SPDX_DEPLOY_SBOM_NAME value changed from '${PN}-deploy-sbom' to 'sbom/${PN}-deploy-sbom'

ERROR: Multiple recipes found for ovmf
    oe-core/meta/recipes-core/ovmf/ovmf-shell-image.bb
    oe-core/meta/recipes-core/ovmf/ovmf_git.bb

ERROR: Signature change for systemd-boot
   systemd-boot:do_create_deploy_sbom: 7a86fba2a50883a07fba055f61ad6c2e1a201addd7968ebfa3b56897194c8d1c -> 8d9a5b22b07ce37e12fba5e94db067a19951ec4ab6a0ee0544dfdd379358d459
      bitbake-diffsigs --task systemd-boot do_create_deploy_sbom --signature 7a86fba2a50883a07fba055f61ad6c2e1a201addd7968ebfa3b56897194c8d1c 8d9a5b22b07ce37e12fba5e94db067a19951ec4ab6a0ee0544dfdd379358d459
      NOTE: Reconnecting to bitbake server...
      basehash changed from 0e84486eb7ac14c2614b55fcbc2b091c717ac1e7006c72c7af76117a9d0aaace to 3fd7c7748f48d21afb7b677dc006f3deebd4bb01e474876e765dcd8e52afac62
      Variable SPDX_DEPLOY_SBOM_NAME value changed from '${PN}-deploy-sbom' to 'sbom/${PN}-deploy-sbom'
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf
index c92e927c..3b9085ac 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 = "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"