From ddbf660c8d3dccbb785001d79b9c1dbeac3ae5b77439a660baf5a5267427676f Mon Sep 17 00:00:00 2001
From: Lubos Kocman <Lubos.Kocman@suse.com>
Date: Mon, 24 Jun 2024 13:13:38 +0200
Subject: [PATCH 1/2] Ensure to import all gpgkeys

---
 Leap/config.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Leap/config.sh b/Leap/config.sh
index 3214755..4d62723 100644
--- a/Leap/config.sh
+++ b/Leap/config.sh
@@ -314,4 +314,17 @@ if [[ "$kiwi_profiles" =~ ^(x86-qcow|x86-vmware|aarch64-qcow)$ ]]; then
     echo "policy: search,found=all,maybe=disabled,notfound=disabled" > /etc/cloud/ds-identify.cfg
 fi
 
+#======================================
+# Import trusted rpm keys
+#--------------------------------------
+for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
+    # importing can fail if it already exists
+    rpm --import $i || true
+done
+
+#======================================
+# Refresh zypper services / repos
+#--------------------------------------
+zypper refs
+
 exit 0
-- 
2.45.2


From 174960e619dd5f826754a818f8b0988cd87fbea022da6aa3bbdd3b71a7b9f28b Mon Sep 17 00:00:00 2001
From: Lubos Kocman <Lubos.Kocman@suse.com>
Date: Mon, 24 Jun 2024 13:14:47 +0200
Subject: [PATCH 2/2] Use openSUSE-build-key

---
 Leap/Leap.kiwi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Leap/Leap.kiwi b/Leap/Leap.kiwi
index 18bd82b..bc2791a 100644
--- a/Leap/Leap.kiwi
+++ b/Leap/Leap.kiwi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- OBS-Profiles: @BUILD_FLAVOR@ -->
 <!-- OBS-Milestone: %current_milestone -->
-<!-- OBS-BcntSyncTag: Leap-Micro -->
+<!-- OBS-BcntSyncTag: Leap -->
 <image schemaversion="7.5" name="openSUSE-Leap-Micro" displayname="openSUSE Leap">
     <description type="system">
         <author>openSUSE</author>
@@ -695,7 +695,7 @@
         <package name="firewalld"/>
 	<package name="NetworkManager-tui"/>
         <package name="growpart-generator"/>
-        <package name="suse-build-key"/>
+        <package name="openSUSE-build-key"/>
         <!-- for debugging -->
         <package name="less"/>
         <package name="vim-small"/>
-- 
2.45.2