From aec87c5e4f56933780c4d58cc1d0e2c3e85d5cd60f1a79c582ca1a065745ca4d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 9 Apr 2021 12:12:21 +0000
Subject: [PATCH 1/2] - Install shim everywhere except on RPi (bsc#1182211)

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=61
---
 JeOS.kiwi                   | 6 +++++-
 kiwi-templates-JeOS.changes | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index 61cfde8..876a223 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -261,7 +261,6 @@
         <package name="iputils"/>
         <package name="issue-generator"/> <!-- bsc#1084879 -->
         <package name="vim-small"/>
-        <package name="shim" arch="x86_64"/>
         <package name="grub2"/>
         <package name="grub2-arm64-efi" arch="aarch64"/>
         <package name="grub2-branding-openSUSE" bootinclude="true"/>
@@ -301,6 +300,11 @@
         <package name="firewalld"/>
     </packages>
 
+    <!-- Shim for secure boot everywhere except for RPi -->
+    <packages type="image" profiles="kvm-and-xen,kvm,VMware,MS-HyperV,OpenStack-Cloud">
+        <package name="shim" arch="aarch64,x86_64"/>
+    </packages>
+
     <packages type="image" profiles="kvm-and-xen">
         <package name="xen-tools-domU"/>
         <package name="xen-libs"/>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 56ed395..5695460 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  7 13:19:01 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Install shim everywhere except on RPi (bsc#1182211)
+
 -------------------------------------------------------------------
 Tue Mar  9 15:44:50 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 

From 9e934882bbf240eb3c5e11e3d7cee02447beba7fbe39c5401ff87b3777fe016a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 9 Apr 2021 12:34:17 +0000
Subject: [PATCH 2/2] There's no "kvm"

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=62
---
 JeOS.kiwi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index 876a223..579f833 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -301,7 +301,7 @@
     </packages>
 
     <!-- Shim for secure boot everywhere except for RPi -->
-    <packages type="image" profiles="kvm-and-xen,kvm,VMware,MS-HyperV,OpenStack-Cloud">
+    <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,OpenStack-Cloud">
         <package name="shim" arch="aarch64,x86_64"/>
     </packages>