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

- list-common: Install ucode-amd explicitly, ignore ucode-intel explicitly.
- config.sh: Omit more network drivers in the initrd,
  delete System.map and tallylog

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

config.sh

@@ -59,16 +59,17 @@ echo 'omit_dracutmodules+=" multipath "' >> /etc/dracut.conf.d/no-multipath.conf
 # Stronger compression for the initrd
 echo 'compress="xz -4 --check=crc32 --memlimit-compress=50%"' >> /etc/dracut.conf.d/less-storage.conf
 
+# Smaller initrd where necessary
 if [ "$desktop" = "x11" ] || [ "$desktop" = "xfce" ]; then
 	# Forcibly exclude networking support
 	sed -i 's/echo network rootfs-block/echo rootfs-block/' /usr/lib/dracut/modules.d/90kiwi-live/module-setup.sh
-	echo 'omit_dracutmodules+=" network "' >> /etc/dracut.conf.d/no-network.conf
+	echo 'omit_dracutmodules+=" network qemu-net rdma "' >> /etc/dracut.conf.d/no-network.conf
 
 	# This only needs to be able to boot the live cd
-	echo 'omit_dracutmodules+=" bcache crypt lvm mdraid lunmask "' >> /etc/dracut.conf.d/less-storage.conf
+	echo 'omit_dracutmodules+=" bcache crypt lvm lunmask mdraid nvdimm "' >> /etc/dracut.conf.d/less-storage.conf
 
 	# Unnecessary modules in the initrd
-	echo 'omit_drivers+=" cifs ocfs2 "' >> /etc/dracut.conf.d/less-storage.conf
+	echo 'omit_drivers+=" ceph chcr cifs csiostor cxgb4 intel_qat ocfs2 bnx2fc qedf "' >> /etc/dracut.conf.d/less-storage.conf
 
 	# Work around https://github.com/OSInside/kiwi/issues/1751
 	sed -i '/omit_dracutmodules=/d' /usr/bin/dracut
@@ -130,8 +131,9 @@ find /lib/firmware/nvidia -name gsp | xargs -r rm -rf
 rm -rf /usr/lib*/ruby/gems/*/cache/
 
 # Not needed, boo#1166406
-rm -f /boot/vmlinux*.[gx]z
-rm -f /lib/modules/*/vmlinux*.[gx]z
+rm -f /boot/vmlinux*.[gx]z /lib/modules/*/vmlinux*.[gx]z
+# Also not needed
+rm -f /boot/System.map-* /lib/modules/*/System.map
 
 # Decompress kernel modules, better for squashfs (boo#1192457)
 find /lib/modules/*/kernel -name '*.ko.xz' -exec xz -d {} +
@@ -164,6 +166,7 @@ passwd -d linux
 pam-config -a --nullok
 
 : > /var/log/zypper.log
+: > /var/log/tallylog
 
 # Create fstab if it doesn't exist (Work around boo#1185815)
 >>/etc/fstab

list-common.sh

@@ -298,3 +298,9 @@ buildignore ntp
 
 # Pulled in by dracut through a boolean dep somehow
 buildignore wicked
+
+install ucode-amd i686,x86_64
+# Technically useful, but with >12MiB simply too big.
+# It hurts twice, once in the early cpio in the initrd (uncompressed) and once in the FS (badly compressed, as encrypted).
+# On TW, it hasn't been pulled into the live CDs for ages so let's just ignore it explicitly.
+buildignore ucode-intel

livecd-leap-gnome.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-gnome.sh -->
     <package name="aaa_base" replaces="libreoffice-calc"/>

livecd-leap-kde.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-kde.sh -->
     <package name="aaa_base" replaces="gvfs"/>

livecd-leap-x11.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-x11.sh -->
     <package name="aaa_base" replaces="NetworkManager-lang"/>

livecd-leap-xfce.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-xfce.sh -->
     <package name="branding-openSUSE"/>

livecd-openSUSE.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 31 15:42:51 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Install ucode-amd explicitly, ignore ucode-intel explicitly.
+- config.sh: Omit more network drivers in the initrd,
+  delete System.map and tallylog
+
 -------------------------------------------------------------------
 Wed Jan 24 07:48:58 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
 

livecd-tumbleweed-gnome.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-gnome.sh -->
     <package name="aaa_base" replaces="libreoffice-calc"/>

livecd-tumbleweed-kde.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-kde.sh -->
     <package name="aaa_base" replaces="gvfs"/>

livecd-tumbleweed-x11.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-x11.sh -->
     <package name="aaa_base" replaces="NetworkManager-lang"/>

livecd-tumbleweed-xfce.kiwi

@@ -415,6 +415,9 @@
     <ignore name="ntp"/>
     <package name="aaa_base" replaces="wicked"/>
     <ignore name="wicked"/>
+    <package name="ucode-amd" arch="i686,x86_64"/>
+    <package name="aaa_base" replaces="ucode-intel"/>
+    <ignore name="ucode-intel"/>
 
     <!-- list-xfce.sh -->
     <package name="branding-openSUSE"/>