From a8faa2867a9f1bb42fde637f251c3d4920ea315a3af47ecfe1ceeb9928fa82d6 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 2 Dec 2021 15:23:26 +0000 Subject: [PATCH 1/2] Accepting request 935220 from home:favogt:branches:openSUSE:Factory:Live - Use /lib/modules without /usr to be compatible with Leap OBS-URL: https://build.opensuse.org/request/show/935220 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=120 --- config.sh | 8 ++++---- list-common.sh | 3 --- livecd-leap-gnome.kiwi | 3 --- livecd-leap-kde.kiwi | 3 --- livecd-leap-x11.kiwi | 3 --- livecd-leap-xfce.kiwi | 3 --- livecd-openSUSE.changes | 10 ++++++++++ livecd-tumbleweed-gnome.kiwi | 3 --- livecd-tumbleweed-kde.kiwi | 3 --- livecd-tumbleweed-x11.kiwi | 3 --- livecd-tumbleweed-xfce.kiwi | 3 --- livecd.kiwi.in | 1 + 12 files changed, 15 insertions(+), 31 deletions(-) diff --git a/config.sh b/config.sh index 424904e..b3808dc 100644 --- a/config.sh +++ b/config.sh @@ -101,12 +101,12 @@ rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress,dpaa2,bn # Not needed, boo#1166406 rm -f /boot/vmlinux*.[gx]z -rm -f /usr/lib/modules/*/vmlinux*.[gx]z +rm -f /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/*) +find /lib/modules/*/kernel -name '*.ko.xz' -exec xz -d {} + +find /lib/modules/*/kernel -name '*.ko.zst' -exec zstd --rm -d {} + +depmod $(basename /lib/modules/*) # Add repos from /etc/YaST2/control.xml add-yast-repos diff --git a/list-common.sh b/list-common.sh index 1c4b894..ebf6b62 100644 --- a/list-common.sh +++ b/list-common.sh @@ -277,9 +277,7 @@ install xf86-video-ark install xf86-video-ati install xf86-video-chips install xf86-video-fbdev -install xf86-video-glint install xf86-video-i128 -install xf86-video-mach64 install xf86-video-mga install xf86-video-neomagic install xf86-video-nouveau @@ -291,7 +289,6 @@ install xf86-video-siliconmotion i686,x86_64 install xf86-video-sis install xf86-video-sisusb install xf86-video-tdfx -install xf86-video-tga install xf86-video-v4l install xf86-video-vesa install xf86-video-voodoo diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index e68d2e5..6bda460 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -400,9 +400,7 @@ - - @@ -414,7 +412,6 @@ - diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index cb504a9..cb1bd67 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -400,9 +400,7 @@ - - @@ -414,7 +412,6 @@ - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index fce0f67..1d45aa2 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -400,9 +400,7 @@ - - @@ -414,7 +412,6 @@ - diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index cc255b4..dec7535 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -400,9 +400,7 @@ - - @@ -414,7 +412,6 @@ - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 57ab263..21869c0 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 2 14:45:48 UTC 2021 - Fabian Vogt + +- Use /lib/modules without /usr to be compatible with Leap + +------------------------------------------------------------------- +Fri Nov 12 11:23:42 UTC 2021 - Dominique Leuenberger + +- Drop no longer maintainer X video drivers: glint, mach64 and tga. + ------------------------------------------------------------------- Wed Nov 10 15:47:19 UTC 2021 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 9dde20a..5ac2970 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -403,9 +403,7 @@ - - @@ -417,7 +415,6 @@ - diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 1bd7eaf..cef7d06 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -403,9 +403,7 @@ - - @@ -417,7 +415,6 @@ - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index ee3e2ef..11c7e6f 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -403,9 +403,7 @@ - - @@ -417,7 +415,6 @@ - diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index b78f614..bca9ce2 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -403,9 +403,7 @@ - - @@ -417,7 +415,6 @@ - diff --git a/livecd.kiwi.in b/livecd.kiwi.in index 52841d0..0bc8566 100644 --- a/livecd.kiwi.in +++ b/livecd.kiwi.in @@ -55,6 +55,7 @@ + @PACKAGES@ From 9d86e86ec302ea3caeb2a07ac9c5ee436bc8398a4c944ab7d2d6d2a500ef607b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 2 Dec 2021 15:24:17 +0000 Subject: [PATCH 2/2] Fix typo: - Drop no longer maintained X video drivers: glint, mach64 and tga. OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=121 --- livecd-openSUSE.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 21869c0..cda41a7 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -6,7 +6,7 @@ Thu Dec 2 14:45:48 UTC 2021 - Fabian Vogt ------------------------------------------------------------------- Fri Nov 12 11:23:42 UTC 2021 - Dominique Leuenberger -- Drop no longer maintainer X video drivers: glint, mach64 and tga. +- Drop no longer maintained X video drivers: glint, mach64 and tga. ------------------------------------------------------------------- Wed Nov 10 15:47:19 UTC 2021 - Fabian Vogt