From 6c5ef24e0556270ee19e5cf3531d5af35cd836e95748626e43e6b775bf9d701d Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 10 Nov 2021 16:04:09 +0000 Subject: [PATCH] Accepting request 930715 from home:favogt:branches:openSUSE:Factory:Live - Uncompress kernel modules to avoid double-compressing in squashfs and initrd (boo#1192457) OBS-URL: https://build.opensuse.org/request/show/930715 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=119 --- config.sh | 5 +++++ livecd-leap-gnome.kiwi | 2 ++ livecd-leap-kde.kiwi | 2 ++ livecd-leap-x11.kiwi | 2 ++ livecd-leap-xfce.kiwi | 2 ++ livecd-openSUSE.changes | 6 ++++++ livecd-tumbleweed-gnome.kiwi | 2 ++ livecd-tumbleweed-kde.kiwi | 2 ++ livecd-tumbleweed-x11.kiwi | 2 ++ livecd-tumbleweed-xfce.kiwi | 2 ++ livecd.kiwi.in | 2 ++ 11 files changed, 29 insertions(+) diff --git a/config.sh b/config.sh index cc73329..424904e 100644 --- a/config.sh +++ b/config.sh @@ -103,6 +103,11 @@ rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress,dpaa2,bn rm -f /boot/vmlinux*.[gx]z rm -f /usr/lib/modules/*/vmlinux*.[gx]z +# Decompress kernel modules, better for squashfs (boo#1192457) +find /usr/lib/modules/*/kernel -name '*.ko.xz' -exec xz -d {} + +find /usr/lib/modules/*/kernel -name '*.ko.zst' -exec zstd --rm -d {} + +depmod $(basename /usr/lib/modules/*) + # Add repos from /etc/YaST2/control.xml add-yast-repos zypper --non-interactive rm -u live-add-yast-repos diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index a37f2fd..e68d2e5 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 4d2d68f..cb504a9 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 26ac8e4..fce0f67 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index f69862c..cc255b4 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 2804267..57ab263 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 10 15:47:19 UTC 2021 - Fabian Vogt + +- Uncompress kernel modules to avoid double-compressing in squashfs + and initrd (boo#1192457) + ------------------------------------------------------------------- Mon Oct 18 14:22:14 UTC 2021 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 5150748..9dde20a 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 0465f79..1bd7eaf 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index dfe1e59..ee3e2ef 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 1010612..b78f614 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -54,6 +54,8 @@ + + diff --git a/livecd.kiwi.in b/livecd.kiwi.in index 0f21af5..52841d0 100644 --- a/livecd.kiwi.in +++ b/livecd.kiwi.in @@ -54,6 +54,8 @@ + + @PACKAGES@