ERL-257: nemos-images-*-lunar: qemu-*: use signed Grub packages

Signed-off-by: Isaac True <isaac.true@canonical.com>
Elektrobit · Aug 7, 2023 · 620939b · 620939b
1 parent b00db96
commit 620939b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/nemos-images-minimal-lunar/qemu-amd64/appliance.kiwi b/nemos-images-minimal-lunar/qemu-amd64/appliance.kiwi
@@ -66,10 +66,8 @@
         <package name="cron"/>
         <package name="zstd"/>
         <!-- bootloader -->
-        <package name="grub-common" arch="x86_64"/>
-        <package name="grub2-common" arch="x86_64"/>
-        <package name="grub-pc-bin" arch="x86_64"/>
-        <package name="grub-efi-amd64-bin" arch="x86_64"/>
+        <package name="grub-pc" />
+        <package name="grub-efi-amd64-signed" />
         <!-- system -->
         <package name="systemd"/>
         <package name="networkd-dispatcher"/>

diff --git a/nemos-images-minimal-lunar/qemu-arm64/appliance.kiwi b/nemos-images-minimal-lunar/qemu-arm64/appliance.kiwi
@@ -66,10 +66,8 @@
         <package name="cron"/>
         <package name="zstd"/>
         <!-- bootloader -->
-        <package name="grub-common" />
         <package name="grub2-common" />
-        <package name="grub-efi-arm64" />
-        <package name="grub-efi-arm64-bin" />
+        <package name="grub-efi-arm64-signed" />
         <!-- system -->
         <package name="systemd"/>
         <package name="networkd-dispatcher"/>

diff --git a/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi b/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
@@ -94,10 +94,8 @@
         <package name="tuptime" />
         <package name="polkitd" />
         <!-- bootloader -->
-        <package name="grub-common" arch="x86_64"/>
-        <package name="grub2-common" arch="x86_64"/>
-        <package name="grub-pc-bin" arch="x86_64"/>
-        <package name="grub-efi-amd64-bin" arch="x86_64"/>
+        <package name="grub-pc" />
+        <package name="grub-efi-amd64-signed" />
         <!-- system -->
         <package name="busybox-static" />
         <package name="cryptsetup" />

diff --git a/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi b/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
@@ -94,10 +94,8 @@
         <package name="tuptime" />
         <package name="polkitd" />
         <!-- bootloader -->
-        <package name="grub-common" />
         <package name="grub2-common" />
-        <package name="grub-efi-arm64" />
-        <package name="grub-efi-arm64-bin" />
+        <package name="grub-efi-arm64-signed" />
         <!-- system -->
         <package name="busybox-static" />
         <package name="cryptsetup" />