From ddc11d8dc5aaa855373732dd9f930b4eba7729d212c3a8bb1ccb3d2bc36d251e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 12 Mar 2024 20:01:40 +0000 Subject: [PATCH] Accepting request 1157326 from home:Vogtinator:livecd - list-kde: Ignore some Qt/Plasma 5 packages and qt6-webengine users - common.sh: Force delete qt6-webengine for now - Fix tumbleweed live image, following the move to Plasma 6: + Limit installation of plasma5-workspace-branding-openSUSE, phonon4qt5-backend-vlc, plasma-nm5, speech-dispatcher, and opensuse-welcome to distro == leap. + Explicitly add phonon-vlc-qt6 on tumbleweed; allow vlc and vlc-qt on Tumbleweed for Plasma6. - config.sh: fdupes /usr/share/licenses OBS-URL: https://build.opensuse.org/request/show/1157326 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=165 --- config.sh | 9 ++++++++- list-kde.sh | 39 +++++++++++++++++++++++++++++--------- livecd-leap-kde.kiwi | 26 ++++++++++++++++--------- livecd-openSUSE.changes | 17 +++++++++++++++++ livecd-tumbleweed-kde.kiwi | 29 +++++++++++++++++----------- pre-checkin.sh | 4 ++-- 6 files changed, 92 insertions(+), 32 deletions(-) diff --git a/config.sh b/config.sh index 112be5e..49d88fa 100644 --- a/config.sh +++ b/config.sh @@ -42,6 +42,13 @@ if [ "$desktop" = "x11" -o "$desktop" = "xfce" ]; then rpm -e --nodeps noto-coloremoji-fonts || rpm -e --nodeps google-noto-coloremoji-fonts fi +# Make the image smaller, work around a hard dep by plasma6-desktop -> signon-ui and kdeplasma6-addons +if rpm -q libQt6WebEngineCore6; then + rpm -e --nodeps libQt6WebEngineCore6 +fi + +/usr/lib/rpm/fdupes_wrapper /usr/share/licenses + #-------------------------------------- # enable and disable services @@ -57,7 +64,7 @@ echo '# multipath needs to be excluded from dracut as it breaks os-prober' > /et 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 +echo 'compress="xz -9 --check=crc32 --memlimit-compress=50%"' >> /etc/dracut.conf.d/less-storage.conf # Smaller initrd where necessary if [ "$desktop" = "x11" ] || [ "$desktop" = "xfce" ]; then diff --git a/list-kde.sh b/list-kde.sh index 2355648..17e9001 100644 --- a/list-kde.sh +++ b/list-kde.sh @@ -12,8 +12,31 @@ buildignore akregator buildignore ImageMagick install patterns-kde-kde installPattern kde -install plasma5-workspace-branding-openSUSE -install baloo5-tools +if [ "$distro" = "leap" ]; then + install plasma5-workspace-branding-openSUSE + install phonon4qt5-backend-vlc + buildignore vlc + buildignore vlc-qt + install plasma-nm5 + # From x11_enhanced, but that pattern can't be installed + install opensuse-welcome + install baloo5-tools +else + install phonon-vlc-qt6 + buildignore gtk3-metatheme-breeze + install kf6-baloo-tools + buildignore libqt5-qttranslations + buildignore speech-dispatcher + + # Until deleted or replaced by kcm_sddm6 + buildignore kcm_sddm + # Until built against Qt 6 + buildignore xwaylandvideobridge + # Needs WebEngine and we don't install docs on the .iso + buildignore khelpcenter + # Needs WebEngine and not useful ATM + buildignore kaccounts-providers +fi install NetworkManager # Don't add libreoffice for now, too large buildignore libreoffice @@ -34,8 +57,6 @@ buildignore oxygen5-icon-theme-large buildignore plasma5-desktop-emojier # Resolve have-choice -install plasma-nm5 -install phonon4qt5-backend-vlc buildignore ispell # No fun allowed @@ -60,16 +81,18 @@ buildignore digikam buildignore gdb buildignore hugin buildignore icewm -buildignore kmahjongg-lang +buildignore ksudoku +buildignore kpat +buildignore kmahjongg buildignore konversation-lang +buildignore libKF5Auth5-lang buildignore libproxy1-pacrunner-webkit -buildignore vlc -buildignore vlc-qt buildignore vlc-lang buildignore kipi-plugins # Upstream branding, not used by default and HUGE buildignore breeze5-wallpapers +buildignore breeze6-wallpapers install partitionmanager @@ -81,7 +104,5 @@ buildignore xorg-x11-fonts # From rest_cd_core install alsa-firmware -# From x11_enhanced, but that pattern can't be installed -install opensuse-welcome buildignore bluedevil5 diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index fdd13ae..26a79ba 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -447,6 +447,13 @@ + + + + + + + @@ -504,8 +511,6 @@ - - @@ -530,29 +535,32 @@ - - + + + + + + + + - - - - + + - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index b522d4e..0739825 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Mar 12 19:57:57 UTC 2024 - Fabian Vogt + +- list-kde: Ignore some Qt/Plasma 5 packages and qt6-webengine users +- common.sh: Force delete qt6-webengine for now + +------------------------------------------------------------------- +Tue Mar 12 12:43:21 UTC 2024 - Dominique Leuenberger + +- Fix tumbleweed live image, following the move to Plasma 6: + + Limit installation of plasma5-workspace-branding-openSUSE, + phonon4qt5-backend-vlc, plasma-nm5, speech-dispatcher, and + opensuse-welcome to distro == leap. + + Explicitly add phonon-vlc-qt6 on tumbleweed; allow vlc and + vlc-qt on Tumbleweed for Plasma6. +- config.sh: fdupes /usr/share/licenses + ------------------------------------------------------------------- Mon Feb 12 09:50:25 UTC 2024 - Fabian Vogt diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index af6f1ea..d32c30a 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -446,8 +446,14 @@ - - + + + + + + + + @@ -495,8 +501,6 @@ - - @@ -521,29 +525,32 @@ - - + + + + + + + + - - - - + + - diff --git a/pre-checkin.sh b/pre-checkin.sh index 1cb5933..b75f94a 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -14,8 +14,8 @@ buildignore() { # but https://github.com/openSUSE/obs-build/issues/420 requires a workaround ## Due to "--ignoreignore--" this has no effect either, so workaround the workaround ## by using , which gets ignored by OBS completely... - PACKAGES="$PACKAGES\n " - PACKAGES="$PACKAGES\n " + PACKAGES="$PACKAGES\n " + PACKAGES="$PACKAGES\n " } installPattern() {