From c2dabd5991ba9821db427886f9d497c7733c5d099ef7ca1af49e822f37d32079 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 2 Feb 2024 10:18:31 +0000 Subject: [PATCH] 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 | 13 ++++++++----- list-common.sh | 6 ++++++ livecd-leap-gnome.kiwi | 3 +++ livecd-leap-kde.kiwi | 3 +++ livecd-leap-x11.kiwi | 3 +++ livecd-leap-xfce.kiwi | 3 +++ livecd-openSUSE.changes | 7 +++++++ livecd-tumbleweed-gnome.kiwi | 3 +++ livecd-tumbleweed-kde.kiwi | 3 +++ livecd-tumbleweed-x11.kiwi | 3 +++ livecd-tumbleweed-xfce.kiwi | 3 +++ 11 files changed, 45 insertions(+), 5 deletions(-) diff --git a/config.sh b/config.sh index 70a37bb..112be5e 100644 --- a/config.sh +++ b/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 diff --git a/list-common.sh b/list-common.sh index 5655292..fe792d8 100644 --- a/list-common.sh +++ b/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 diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 54c996a..37de208 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 688a451..657e2ad 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index bec87c8..2af0b05 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index 5ab2c48..c94566a 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 4aa2859..62864f4 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 31 15:42:51 UTC 2024 - Fabian Vogt + +- 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 diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index e8fd199..89f5a73 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 1a35f77..185006f 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 6fbedfb..e412fc3 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -415,6 +415,9 @@ + + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 2ce2b12..b529888 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -415,6 +415,9 @@ + + +