From 8d7743b92fe0b21ded5c234e40774e1d3878c8f5fb57b379cf88509d5bc01c28 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 24 Jan 2022 10:27:27 +0000 Subject: [PATCH] Accepting request 948363 from home:favogt:branches:openSUSE:Factory:Live More dirty hacks. - list-common: Avoid samba-libs - list-kde, list-gnome: Don't require cifs-utils - list-x11: Ignore 7zip - config.sh: Compress the initrd more strongly, delete the ruby gem cache and block some more kernel modules in the initrd OBS-URL: https://build.opensuse.org/request/show/948363 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=126 --- config.sh | 9 +++++++++ list-common.sh | 4 ++++ list-gnome.sh | 1 - list-kde.sh | 2 -- list-x11.sh | 1 + livecd-leap-gnome.kiwi | 5 ++++- livecd-leap-kde.kiwi | 5 ++++- livecd-leap-x11.kiwi | 6 ++++++ livecd-leap-xfce.kiwi | 4 ++++ livecd-openSUSE.changes | 9 +++++++++ livecd-tumbleweed-gnome.kiwi | 5 ++++- livecd-tumbleweed-kde.kiwi | 5 ++++- livecd-tumbleweed-x11.kiwi | 6 ++++++ livecd-tumbleweed-xfce.kiwi | 4 ++++ 14 files changed, 59 insertions(+), 7 deletions(-) diff --git a/config.sh b/config.sh index f5715df..6f5c245 100644 --- a/config.sh +++ b/config.sh @@ -51,6 +51,9 @@ done echo '# multipath needs to be excluded from dracut as it breaks os-prober' > /etc/dracut.conf.d/no-multipath.conf 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 + 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 @@ -59,6 +62,9 @@ if [ "$desktop" = "x11" ] || [ "$desktop" = "xfce" ]; then # 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 + # Unnecessary modules in the initrd + echo 'omit_drivers+=" cifs ocfs2 "' >> /etc/dracut.conf.d/less-storage.conf + # Work around https://github.com/OSInside/kiwi/issues/1751 sed -i '/omit_dracutmodules=/d' /usr/bin/dracut fi @@ -101,6 +107,9 @@ rm -rf /usr/share/doc/packages/* # Save more than 200 MiB by removing this, not very useful for lives rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress,dpaa2,bnx2x,cxgb4} +# The gems are unpackaged already, no need to store them twice +rm -rf /usr/lib*/ruby/gems/*/cache/ + # Not needed, boo#1166406 rm -f /boot/vmlinux*.[gx]z rm -f /lib/modules/*/vmlinux*.[gx]z diff --git a/list-common.sh b/list-common.sh index 4a61053..66d39b0 100644 --- a/list-common.sh +++ b/list-common.sh @@ -81,6 +81,10 @@ buildignore irda buildignore lomoco buildignore mksh +# Ignore samba +buildignore cifs-utils +buildignore gvfs-backend-samba + # Legacy packages - not actually used, but pull in quite a lot buildignore xorg-x11 buildignore xorg-x11-essentials diff --git a/list-gnome.sh b/list-gnome.sh index 77e2130..9fce61a 100644 --- a/list-gnome.sh +++ b/list-gnome.sh @@ -111,7 +111,6 @@ installPattern yast2_install_wf install gnome-mines install gnome-sudoku install quadrapassel -install cifs-utils # Pulls in Qt WebEngine, too big buildignore opensuse-welcome diff --git a/list-kde.sh b/list-kde.sh index 0117290..2e08f89 100644 --- a/list-kde.sh +++ b/list-kde.sh @@ -72,8 +72,6 @@ fi install partitionmanager -install cifs-utils - # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD buildignore cyrus-sasl diff --git a/list-x11.sh b/list-x11.sh index 69bdb54..30c8eb9 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -73,6 +73,7 @@ buildignore man buildignore groff buildignore libqt5-qttranslations buildignore plymouth +buildignore 7zip # tumbler -> libgepup uses libwebkit2gtk-4_0-37, while epiphany uses libwebkit2gtk-4_1-0. # We can't have both, too big. diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index b742f23..ccb60ac 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -203,6 +203,10 @@ + + + + @@ -565,7 +569,6 @@ - diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 9d2bbac..e6837d9 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -203,6 +203,10 @@ + + + + @@ -532,7 +536,6 @@ - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 4b8e8ad..9020992 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -203,6 +203,10 @@ + + + + @@ -569,6 +573,8 @@ + + diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index dc1502a..79e199f 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -203,6 +203,10 @@ + + + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 942f49d..1cea51e 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 24 09:45:22 UTC 2022 - Fabian Vogt + +- list-common: Avoid samba-libs +- list-kde, list-gnome: Don't require cifs-utils +- list-x11: Ignore 7zip +- config.sh: Compress the initrd more strongly, delete the ruby gem + cache and block some more kernel modules in the initrd + ------------------------------------------------------------------- Thu Jan 13 10:28:43 UTC 2022 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index f692080..d8e12b8 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -203,6 +203,10 @@ + + + + @@ -559,7 +563,6 @@ - diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 05533fa..c8fab70 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -203,6 +203,10 @@ + + + + @@ -528,7 +532,6 @@ - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index c229799..ed68928 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -203,6 +203,10 @@ + + + + @@ -563,6 +567,8 @@ + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 1dabea1..697c085 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -203,6 +203,10 @@ + + + +