Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2020-11-27 15:47:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Fri Nov 27 15:47:53 2020 rev:130 rq:851355 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2020-11-27 08:58:39.189795222 +0100
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.5913/livecd-openSUSE.changes
2020-11-27 15:47:56.881576516 +0100
@@ -1,0 +2,6 @@
+Fri Nov 27 12:49:12 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Also drop files from /usr/lib/locale and /usr/share/qt5/translations
+- Also drop zh* locales
+
+-------------------------------------------------------------------
@@ -5,0 +12,12 @@
+
+-------------------------------------------------------------------
+Mon Nov 16 10:15:46 UTC 2020 - Fabian Vogt <[email protected]>
+
+- 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 <[email protected]>
+
+- Switch "leap" back to "Leap" for 15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ livecd-leap-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.xjhGx2/_old 2020-11-27 15:47:57.833577452 +0100
+++ /var/tmp/diff_new_pack.xjhGx2/_new 2020-11-27 15:47:57.837577456 +0100
@@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
-<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-GNOME-Live"
displayname="openSUSE Jump %OS_VERSION_ID% GNOME Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live"
displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
<description type="system">
<author>openSUSE Project</author>
<contact>[email protected]</contact>
@@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
++++++ livecd-leap-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.xjhGx2/_old 2020-11-27 15:47:57.853577471 +0100
+++ /var/tmp/diff_new_pack.xjhGx2/_new 2020-11-27 15:47:57.857577475 +0100
@@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
-<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-KDE-Live"
displayname="openSUSE Jump %OS_VERSION_ID% KDE Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live"
displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
<description type="system">
<author>openSUSE Project</author>
<contact>[email protected]</contact>
@@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
++++++ livecd-leap-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.xjhGx2/_old 2020-11-27 15:47:57.873577491 +0100
+++ /var/tmp/diff_new_pack.xjhGx2/_new 2020-11-27 15:47:57.873577491 +0100
@@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
-<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-Rescue-CD"
displayname="openSUSE Jump %OS_VERSION_ID% Rescue CD">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD"
displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
<description type="system">
<author>openSUSE Project</author>
<contact>[email protected]</contact>
@@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
livecd-tumbleweed-gnome.kiwi: same change
livecd-tumbleweed-kde.kiwi: same change
livecd-tumbleweed-x11.kiwi: same change
livecd-tumbleweed-xfce.kiwi: same change
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.xjhGx2/_old 2020-11-27 15:47:57.997577613 +0100
+++ /var/tmp/diff_new_pack.xjhGx2/_new 2020-11-27 15:47:58.001577616 +0100
@@ -42,7 +42,7 @@
#--------------------------------------
# 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 @@
(cd "${EULA_DIR}"; tar -cvzf /license.tar.gz *)
# Remove some large locales to save space
-rm -rf /usr/share/locale/{ca,cs,da,ja,fi,id,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW}
+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 @@
: > /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 @@
# 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 <<EOF
# boo#1155545 - LOADER_TYPE has to be nil for the upgrade to work properly.
# Kiwi does not allow changing the file directly, so do it in this ugly way.
++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.xjhGx2/_old 2020-11-27 15:47:58.133577747 +0100
+++ /var/tmp/diff_new_pack.xjhGx2/_new 2020-11-27 15:47:58.133577747 +0100
@@ -36,7 +36,7 @@
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
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
