From c5e7637e712f5abd707bd4cfbaddd064eb1ead24708e049d65f0ab1546ad2e46 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 27 Nov 2020 14:45:35 +0000 Subject: [PATCH] Accepting request 851354 from home:favogt:branches:openSUSE:Factory:Live - Also drop files from /usr/lib/locale and /usr/share/qt5/translations - Also drop zh* locales - Don't enable spice-vdagentd.service, that's done by udev - Don't try to delete netronome firmware twice - Add upgrade.desktop on xfce as well - Switch "leap" back to "Leap" for 15.3 OBS-URL: https://build.opensuse.org/request/show/851354 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=82 --- config.sh | 31 +++++++++---------------------- list-common.sh | 1 + list-kde.sh | 1 - livecd-leap-gnome.kiwi | 8 +++++--- livecd-leap-kde.kiwi | 10 +++++----- livecd-leap-x11.kiwi | 8 +++++--- livecd-openSUSE.changes | 24 ++++++++++++++++++++++++ livecd-tumbleweed-gnome.kiwi | 2 ++ livecd-tumbleweed-kde.kiwi | 4 ++-- livecd-tumbleweed-x11.kiwi | 2 ++ livecd-tumbleweed-xfce.kiwi | 2 ++ pre-checkin.sh | 2 +- 12 files changed, 58 insertions(+), 37 deletions(-) diff --git a/config.sh b/config.sh index 5b49ae5..add0796 100644 --- a/config.sh +++ b/config.sh @@ -42,7 +42,7 @@ rpm -qa | grep "^cpp" | xargs -r rpm -e --nodeps #-------------------------------------- # enable and disable services -for i in langset NetworkManager firewalld spice-vdagentd; do +for i in langset NetworkManager firewalld; do systemctl -f enable $i done @@ -70,7 +70,8 @@ EULA_DIR=/etc/YaST2/licenses/base (cd "${EULA_DIR}"; tar -cvzf /license.tar.gz *) # Remove some large locales to save space -rm -rf /usr/share/locale/{uk,sv,ru,ja,da,cs,sr,vi} +rm -rf /usr/{lib,share}/locale/{ca,cs,da,ja,fi,id,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}* +rm -rf /usr/share/qt5/translations/*_{ca,cs,da,ja,fi,id,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}* zypper --non-interactive rm yast2-trans-{uk,sv,ru,ja,da,cs,sr,vi} || : # Some packages really exaggerate here @@ -107,31 +108,20 @@ pam-config -a --nullok : > /var/log/zypper.log +# Add Installation and upgrade icons to the desktop if [ "$desktop" = "kde" ]; then # bug 989897, avoid creating desktop directory on KDE so that the default items are added on first login - cp /usr/share/applications/installation.desktop /usr/share/kio_desktop/DesktopLinks/ - # Also show the update icon if the .desktop file is available - cp /usr/share/applications/upgrade.desktop /usr/share/kio_desktop/DesktopLinks/ || : + cp /usr/share/applications/{installation,upgrade}.desktop /usr/share/kio_desktop/DesktopLinks/ # Set the application as being "trusted" - chmod a+x /usr/share/kio_desktop/DesktopLinks/installation.desktop - chmod a+x /usr/share/kio_desktop/DesktopLinks/upgrade.desktop || : + chmod a+x /usr/share/kio_desktop/DesktopLinks/{installation,upgrade}.desktop elif [ "$desktop" = "xfce" ]; then - # Add Installation icon to desktop folder mkdir -p /home/linux/.config /home/linux/Desktop echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs - cp /usr/share/applications/installation.desktop /home/linux/Desktop/ + cp /usr/share/applications/{installation,upgrade}.desktop /home/linux/Desktop/ # Set the application as being "trusted" - chown -R linux /home/linux/Desktop/installation.desktop - chmod a+x /home/linux/Desktop/installation.desktop -# else case disabled: 'x11' (rescue) does not contain the installer, GNOME Shell has no concept of 'desktop' -#else -# # Add Installation icon to desktop folder -# mkdir -p /home/linux/.config /home/linux/Desktop -# echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs -# ln -s /usr/share/applications/installation.desktop /home/linux/Desktop/ -# # Set the application as being "trusted" -# chmod a+x /home/linux/Desktop/installation.desktop + chmod a+x /home/linux/Desktop/{installation,upgrade}.desktop fi +# 'x11' (rescue) does not contain the installer, GNOME Shell has no concept of 'desktop' chown -R linux /home/linux @@ -163,9 +153,6 @@ echo "Storage=volatile" >> /etc/systemd/journald.conf # Remove generated files (boo#1098535) rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random-seed -# Remove netronome firmware (part of kernel-firmware): this sums up to 125MB -rm -rf /lib/firmware/netronome/ - cat >/etc/systemd/system/fixupbootloader.service < - + openSUSE Project opensuse@opensuse.org @@ -13,7 +13,7 @@ - + 2.8.0 openSUSE bgrt @@ -23,7 +23,7 @@ true - + 2.8.0 openSUSE bgrt @@ -67,6 +67,8 @@ + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index dfe6343..98f90e3 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -2,7 +2,7 @@ - + openSUSE Project opensuse@opensuse.org @@ -13,7 +13,7 @@ - + 2.8.0 openSUSE bgrt @@ -23,7 +23,7 @@ true - + 2.8.0 openSUSE bgrt @@ -67,6 +67,8 @@ + + @@ -480,8 +482,6 @@ - - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 7d93241..7b46455 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -2,7 +2,7 @@ - + openSUSE Project opensuse@opensuse.org @@ -13,7 +13,7 @@ - + 2.8.0 openSUSE bgrt @@ -23,7 +23,7 @@ true - + 2.8.0 openSUSE bgrt @@ -67,6 +67,8 @@ + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index fbb4ff4..21c4268 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Nov 27 12:49:12 UTC 2020 - Fabian Vogt + +- Also drop files from /usr/lib/locale and /usr/share/qt5/translations +- Also drop zh* locales + +------------------------------------------------------------------- +Fri Nov 27 07:57:16 UTC 2020 - Dominique Leuenberger + +- Ignore gimp-lang on all flavors, not only kde (mainly needed on + xfce, where space is tight). + +------------------------------------------------------------------- +Mon Nov 16 10:15:46 UTC 2020 - Fabian Vogt + +- Don't enable spice-vdagentd.service, that's done by udev +- Don't try to delete netronome firmware twice +- Add upgrade.desktop on xfce as well + +------------------------------------------------------------------- +Wed Nov 4 12:38:52 UTC 2020 - Fabian Vogt + +- Switch "leap" back to "Leap" for 15.3 + ------------------------------------------------------------------- Wed Nov 4 09:30:39 UTC 2020 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 2bc0cd6..2065efd 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -67,6 +67,8 @@ + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 99999e4..ad8680f 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -67,6 +67,8 @@ + + @@ -474,8 +476,6 @@ - - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 7018c10..a11ea1a 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -67,6 +67,8 @@ + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 0ab6a8d..9d4b530 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -67,6 +67,8 @@ + + diff --git a/pre-checkin.sh b/pre-checkin.sh index 45c2c6d..5e9b0ca 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -36,7 +36,7 @@ for distro in leap tumbleweed; do bootsplash="bgrt" releaseprefix="openSUSE" if [ "${distro}" = "leap" ]; then - distroname="openSUSE Jump %OS_VERSION_ID%" + distroname="openSUSE Leap %OS_VERSION_ID%" # This changes every few weeks, apparently. #releaseprefix="Leap" fi