From b28b2dcd935af2fb111aae0c71682c7cf99f9a54 Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@wolfs.io>
Date: Tue, 10 Dec 2024 08:20:32 -0500
Subject: [PATCH] don't provide for embedded components (#36172)

melange's sca rightfully picks up provides for the embedded components
(like containerd), so avoid providing these via k3s-static.

Signed-off-by: Josh Wolf <josh@wolfs.io>
---
 k3s.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/k3s.yaml b/k3s.yaml
index f9ab85e1b2b..6fc1df3b576 100644
--- a/k3s.yaml
+++ b/k3s.yaml
@@ -1,7 +1,7 @@
 package:
   name: k3s
   version: 1.31.2.1
-  epoch: 4
+  epoch: 5
   description:
   copyright:
     - license: Apache-2.0
@@ -154,6 +154,9 @@ subpackages:
         - runc
         - umount
         - kmod
+    options:
+      # Do not provide copies of the statically linked embedded components (like containerd)
+      no-provides: true
     pipeline:
       - runs: |
           sed -i '/VERSION_RUNC=$(get-module-version github.com\/opencontainers\/runc)/a VERSION_RUNC="v1.1.14"' ./scripts/version.sh