Accepting request 1094667 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

- livecd.kiwi.in, list-common.sh: Make use of patterns-base-bootloader and
  drop redundant package inclusions. This also adds mokutil (boo#1209985).
- Drop gfxboot, kiwi uses grub2 on ix86 for some time now (forwarded request 1094664 from favogt)

OBS-URL: https://build.opensuse.org/request/show/1094667
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=206

list-common.sh

@@ -53,8 +53,6 @@ buildignore inxi
 buildignore sane-backends
 
 install branding-openSUSE
-install gfxboot i686
-install shim x86_64
 
 # Don't pull in any -32bit libs
 buildignore glibc-32bit

livecd-leap-gnome.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-leap-kde.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-leap-x11.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-leap-xfce.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-openSUSE.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 22 12:05:26 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- livecd.kiwi.in, list-common.sh: Make use of patterns-base-bootloader and
+  drop redundant package inclusions. This also adds mokutil (boo#1209985).
+- Drop gfxboot, kiwi uses grub2 on ix86 for some time now
+
 -------------------------------------------------------------------
 Thu Jun 22 06:14:21 UTC 2023 - Dominique Leuenberger <dleuenberger@suse.com>
 

livecd-tumbleweed-gnome.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-tumbleweed-kde.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-tumbleweed-x11.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd-tumbleweed-xfce.kiwi

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>

livecd.kiwi.in

@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>