From 7ef078a6324dd2cd9fd1cc319e8cfee84ebf7859 Mon Sep 17 00:00:00 2001
From: Mateusz Urbanek <mateusz.urbanek@siderolabs.com>
Date: Fri, 1 Aug 2025 07:31:50 +0200
Subject: [PATCH] fix: remove sbom of kernel modules

Fixes #770

Signed-off-by: Mateusz Urbanek <mateusz.urbanek@siderolabs.com>
---
 dvb/cx23885/pkg.yaml                         | 3 ---
 dvb/dvb-m88ds3103/pkg.yaml                   | 3 ---
 guest-agents/qemu-guest-agent/pcre2/pkg.yaml | 2 +-
 storage/zfs/zfs-tools/pkg.yaml               | 7 -------
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dvb/cx23885/pkg.yaml b/dvb/cx23885/pkg.yaml
index d7489ad..b8a2b2b 100644
--- a/dvb/cx23885/pkg.yaml
+++ b/dvb/cx23885/pkg.yaml
@@ -46,9 +46,6 @@ steps:
         cp -r /rootfs/ /extensions-validator-rootfs/rootfs
         cp /pkg/manifest.yaml /extensions-validator-rootfs/manifest.yaml
         /extensions-validator validate --rootfs=/extensions-validator-rootfs --pkg-name="${PKG_NAME}"
-    sbom:
-      outputPath: /rootfs/usr/local/share/spdx/cx23885.spdx.json
-      version: {{ .LINUX_DVB_FIRMWARE }}
     # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr
 finalize:
   - from: /rootfs
diff --git a/dvb/dvb-m88ds3103/pkg.yaml b/dvb/dvb-m88ds3103/pkg.yaml
index bf773f0..c2c743a 100644
--- a/dvb/dvb-m88ds3103/pkg.yaml
+++ b/dvb/dvb-m88ds3103/pkg.yaml
@@ -33,9 +33,6 @@ steps:
         cp -r /rootfs/ /extensions-validator-rootfs/rootfs
         cp /pkg/manifest.yaml /extensions-validator-rootfs/manifest.yaml
         /extensions-validator validate --rootfs=/extensions-validator-rootfs --pkg-name="${PKG_NAME}"
-    sbom:
-      outputPath: /rootfs/usr/local/share/spdx/dvb-m88ds3103.spdx.json
-      version: {{ .VERSION }}
 finalize:
   - from: /rootfs
     to: /rootfs
diff --git a/guest-agents/qemu-guest-agent/pcre2/pkg.yaml b/guest-agents/qemu-guest-agent/pcre2/pkg.yaml
index acc081a..e3796bf 100644
--- a/guest-agents/qemu-guest-agent/pcre2/pkg.yaml
+++ b/guest-agents/qemu-guest-agent/pcre2/pkg.yaml
@@ -27,7 +27,7 @@ steps:
       outputPath: /rootfs/usr/local/share/spdx/pcre2.spdx.json
       version: {{ .PCRE2_VERSION }}
       cpes:
-        - cpe:2.3:a:pcre:pcre2:{{ .CONTAINER_TOOLKIT_VERSION }}:*:*:*:*:*:*:*
+        - cpe:2.3:a:pcre:pcre2:{{ .PCRE2_VERSION }}:*:*:*:*:*:*:*
       licenses:
         - BSD-2-Clause
 finalize:
diff --git a/storage/zfs/zfs-tools/pkg.yaml b/storage/zfs/zfs-tools/pkg.yaml
index 1f64858..8f15fda 100644
--- a/storage/zfs/zfs-tools/pkg.yaml
+++ b/storage/zfs/zfs-tools/pkg.yaml
@@ -40,13 +40,6 @@ steps:
         # since talos doesn't have a shell, this would fail
         # the default shipped file is a no-op, so safe to remove.
         rm -f /rootfs/usr/local/libexec/zfs/zfs_prepare_disk
-    sbom:
-      outputPath: /rootfs/usr/local/share/spdx/zfs-tools.spdx.json
-      version: {{ .ZFS_DRIVER_VERSION }}
-      cpes:
-        - cpe:2.3:a:openzfs:openzfs:{{ .ZFS_DRIVER_VERSION }}:*:*:*:*:*:*:*
-      licenses:
-        - CDDL-1.0
 finalize:
   - from: /rootfs
     to: /rootfs