From 36f4422c483b50d41ba991e5df194c7f9afb3e5c Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Thu, 8 Jun 2023 10:16:30 +0200 Subject: [PATCH 1/3] Prefer kernel-default over kernel-vanilla --- _config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_config b/_config index ec177af..9dfdebd 100644 --- a/_config +++ b/_config @@ -701,6 +701,8 @@ Prefer: go -go1.13 # have choice for kernel >= 4.1.0 needed by libbcc0: kernel-debug kernel-default kernel-default-base kernel-kvmsmall kernel-vanilla Prefer: kernel-default-base +# have choice for (kmod(sg.ko) if kernel) needed by suse-module-tools: kernel-default kernel-vanilla +Prefer: -kernel-vanilla # have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up) Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common From d2827f4997e21e4678031550a26c936ad9a36ce6 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 9 Jun 2023 16:31:33 +0200 Subject: [PATCH 2/3] Avoid building shim on x86_64 (we are using aggregate from 15-SP1 which is signed as needed --- _config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_config b/_config index 9dfdebd..8933269 100644 --- a/_config +++ b/_config @@ -214,6 +214,11 @@ Macros: :Macros %endif +%ifarch x86_64 +BuildFlags: excludebuild:shim +BuildFlags: excludebuild:shim-leap +%endif + %if "%_repository" == "images" || "%_repository" == "container" Prefer: openSUSE-release -dummy-release # FTP tree takes forever From 5de9409850d09d7ce9884f326a80362c8d9da1a4 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 9 Jun 2023 16:32:43 +0200 Subject: [PATCH 3/3] add comment --- _config | 1 + 1 file changed, 1 insertion(+) diff --git a/_config b/_config index 8933269..4e60497 100644 --- a/_config +++ b/_config @@ -214,6 +214,7 @@ Macros: :Macros %endif +# shim signed by MicroSoft is temporarily aggregated from SLE15-SP1 %ifarch x86_64 BuildFlags: excludebuild:shim BuildFlags: excludebuild:shim-leap