Accepting request 1067117 from home:favogt:branches:openSUSE:Factory:Live

- list-gnome: ignore sushi on Leap, deps too big. Hopefully temporary.

OBS-URL: https://build.opensuse.org/request/show/1067117
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=141

config.sh

@@ -50,7 +50,7 @@ for i in langset NetworkManager firewalld; do
 done
 
 for i in sshd cron wicked purge-kernels; do
-	systemctl -f disable $i
+	systemctl -f disable $i || true
 done
 
 echo '# multipath needs to be excluded from dracut as it breaks os-prober' > /etc/dracut.conf.d/no-multipath.conf

list-common.sh

@@ -217,6 +217,9 @@ install patterns-base-x11
 installPattern x11
 installPattern sw_management
 
+# checkmedia is used for the 'Check media' entry in grub
+install checkmedia
+
 # For working with filesystems
 install bcache-tools
 install btrfsprogs

list-gnome.sh

@@ -120,3 +120,7 @@ buildignore opensuse-welcome
 
 # Pulls in a different WebKit version on Leap and doesn't offer any useful manuals anyway
 buildignore yelp
+# Same issue, but arguably useful and hopefully fixed soon.
+if [ "$distro" = "leap" ]; then
+	buildignore sushi
+fi

livecd-leap-gnome.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
@@ -594,6 +595,8 @@
     <ignore name="opensuse-welcome"/>
     <package name="aaa_base" replaces="yelp"/>
     <ignore name="yelp"/>
+    <package name="aaa_base" replaces="sushi"/>
+    <ignore name="sushi"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>

livecd-leap-kde.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>

livecd-leap-x11.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
@@ -490,10 +491,8 @@
     <ignore name="yast2-control-center"/>
     <package name="aaa_base" replaces="yast2-control-center-qt"/>
     <ignore name="yast2-control-center-qt"/>
-    <package name="aaa_base" replaces="libyui-qt-pkg*"/>
+    <package name="aaa_base" replaces="libyui*"/>
-    <ignore name="libyui-qt-pkg*"/>
+    <ignore name="libyui*"/>
-    <package name="aaa_base" replaces="libyui-qt*"/>
-    <ignore name="libyui-qt*"/>
     <package name="aaa_base" replaces="Mesa-libva"/>
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>

livecd-leap-xfce.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>

livecd-openSUSE.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 21 15:27:21 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-gnome: ignore sushi on Leap, deps too big. Hopefully temporary.
+
+-------------------------------------------------------------------
+Wed Nov 23 07:44:58 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Explicitly list 'checkmedia' to be added to the live images
+  (boo#1205540).
+
 -------------------------------------------------------------------
 Thu Nov 17 10:22:49 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 

livecd-tumbleweed-gnome.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>

livecd-tumbleweed-kde.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>

livecd-tumbleweed-x11.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
@@ -490,10 +491,8 @@
     <ignore name="yast2-control-center"/>
     <package name="aaa_base" replaces="yast2-control-center-qt"/>
     <ignore name="yast2-control-center-qt"/>
-    <package name="aaa_base" replaces="libyui-qt-pkg*"/>
+    <package name="aaa_base" replaces="libyui*"/>
-    <ignore name="libyui-qt-pkg*"/>
+    <ignore name="libyui*"/>
-    <package name="aaa_base" replaces="libyui-qt*"/>
-    <ignore name="libyui-qt*"/>
     <package name="aaa_base" replaces="Mesa-libva"/>
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>

livecd-tumbleweed-xfce.kiwi

@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>