From db9e342a81f8387e892d5caeb45dac85f2288f67aa162ab6ad2c330d1968d8ae Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 22 Jun 2023 13:01:13 +0000
Subject: [PATCH] Accepting request 1094664 from
 home:favogt:branches:openSUSE:Factory:Live

- 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

OBS-URL: https://build.opensuse.org/request/show/1094664
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=149
---
 list-common.sh               |  3 +--
 list-gnome.sh                |  1 +
 livecd-leap-gnome.kiwi       | 11 +++++------
 livecd-leap-kde.kiwi         |  9 +++------
 livecd-leap-x11.kiwi         |  9 +++------
 livecd-leap-xfce.kiwi        |  9 +++------
 livecd-openSUSE.changes      | 15 +++++++++++++++
 livecd-tumbleweed-gnome.kiwi | 11 +++++------
 livecd-tumbleweed-kde.kiwi   |  9 +++------
 livecd-tumbleweed-x11.kiwi   |  9 +++------
 livecd-tumbleweed-xfce.kiwi  |  9 +++------
 livecd.kiwi.in               |  5 +----
 12 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index 50c1cd4..ba928e6 100644
--- a/list-common.sh
+++ b/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
@@ -119,6 +117,7 @@ buildignore pam_kwallet
 
 buildignore apparmor-docs
 buildignore mutt-doc
+buildignore coreutils-doc
 
 # Do not buildignore here. Needed by pidgin in Xfce Live CD.
 # buildignore cyrus-sasl
diff --git a/list-gnome.sh b/list-gnome.sh
index d3bb1e1..1dbd134 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -46,6 +46,7 @@ buildignore gnome-software
 
 # Pulls in color management tools
 buildignore gnome-control-center-color
+buildignore gnome-control-center-user-faces
 
 # 17 MiB, really?
 buildignore libgweather-lang
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 1f20f5e..386ed3f 100644
--- a/livecd-leap-gnome.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
@@ -527,6 +524,8 @@
     <ignore name="gnome-software"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
     <ignore name="gnome-control-center-color"/>
+    <package name="aaa_base" replaces="gnome-control-center-user-faces"/>
+    <ignore name="gnome-control-center-user-faces"/>
     <package name="aaa_base" replaces="libgweather-lang"/>
     <ignore name="libgweather-lang"/>
     <package name="aaa_base" replaces="gnome-user-docs"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index d0e6ca9..8ef3d24 100644
--- a/livecd-leap-kde.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 18ad55a..a0a0510 100644
--- a/livecd-leap-x11.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 362612e..566b2db 100644
--- a/livecd-leap-xfce.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 2aad0c0..0b36596 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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>
+
+- list-gnome.sh: ignore gnome-control-center-user-faces: gain some
+  space; user generation on the live system is not relevant.
+- list-common.sh: drop coreutils-doc: a little bit more space for
+  all.
+
 -------------------------------------------------------------------
 Wed Apr 12 12:02:26 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 2ccbe8b..8710153 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
@@ -518,6 +515,8 @@
     <ignore name="gnome-software"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
     <ignore name="gnome-control-center-color"/>
+    <package name="aaa_base" replaces="gnome-control-center-user-faces"/>
+    <ignore name="gnome-control-center-user-faces"/>
     <package name="aaa_base" replaces="libgweather-lang"/>
     <ignore name="libgweather-lang"/>
     <package name="aaa_base" replaces="gnome-user-docs"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index c3e3093..72c89ef 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index df2b0f3..ddf77cc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index c9c8062..83d0195 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/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"/>
@@ -243,6 +238,8 @@
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
     <ignore name="mutt-doc"/>
+    <package name="aaa_base" replaces="coreutils-doc"/>
+    <ignore name="coreutils-doc"/>
     <package name="aaa_base" replaces="unar"/>
     <ignore name="unar"/>
     <package name="aaa_base" replaces="jing"/>
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index 0bc8566..7d5a0cf 100644
--- a/livecd.kiwi.in
+++ b/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"/>