Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2020-11-04 11:07:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.11331 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Wed Nov 4 11:07:20 2020 rev:125 rq:845917 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2020-11-04 10:14:30.591672151 +0100
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.11331/livecd-openSUSE.changes
2020-11-04 11:07:24.233191775 +0100
@@ -15,0 +16,7 @@
+Wed Oct 14 08:36:12 UTC 2020 - Fabian Vogt <fv...@suse.com>
+
+- Drop set -e, it breaks when there's a conditional experssion as
+ last statement in a file
+- Use vim-small for non-Rescue as well
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ livecd-leap-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:25.989188159 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:25.989188159 +0100
@@ -317,6 +317,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
@@ -471,8 +473,6 @@
<ignore name="gnome-software"/>
<package name="aaa_base" replaces="gnome-control-center-color"/>
<ignore name="gnome-control-center-color"/>
- <package name="aaa_base" replaces="vim-data"/>
- <ignore name="vim-data"/>
<package name="aaa_base" replaces="libgweather-lang"/>
<ignore name="libgweather-lang"/>
<package name="aaa_base" replaces="gnome-user-docs"/>
++++++ livecd-leap-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.009188117 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.009188117 +0100
@@ -317,6 +317,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
++++++ livecd-leap-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.025188084 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.029188076 +0100
@@ -317,6 +317,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
@@ -492,8 +494,6 @@
<ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/>
- <package name="aaa_base" replaces="vim-data"/>
- <ignore name="vim-data"/>
<package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/>
<package name="gparted"/>
++++++ livecd-tumbleweed-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.053188026 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.053188026 +0100
@@ -317,6 +317,11 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
+ <package name="aaa_base" replaces="vim"/>
+ <ignore name="vim"/>
+ <package name="vim-small"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
@@ -462,8 +467,6 @@
<ignore name="gnome-software"/>
<package name="aaa_base" replaces="gnome-control-center-color"/>
<ignore name="gnome-control-center-color"/>
- <package name="aaa_base" replaces="vim-data"/>
- <ignore name="vim-data"/>
<package name="aaa_base" replaces="libgweather-lang"/>
<ignore name="libgweather-lang"/>
<package name="aaa_base" replaces="gnome-user-docs"/>
++++++ livecd-tumbleweed-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.081187969 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.085187961 +0100
@@ -317,6 +317,11 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
+ <package name="aaa_base" replaces="vim"/>
+ <ignore name="vim"/>
+ <package name="vim-small"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
++++++ livecd-tumbleweed-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.101187928 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.105187920 +0100
@@ -317,6 +317,11 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
+ <package name="aaa_base" replaces="vim"/>
+ <ignore name="vim"/>
+ <package name="vim-small"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
@@ -483,11 +488,6 @@
<ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/>
- <package name="aaa_base" replaces="vim-data"/>
- <ignore name="vim-data"/>
- <package name="aaa_base" replaces="vim"/>
- <ignore name="vim"/>
- <package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/>
<package name="gparted"/>
++++++ livecd-tumbleweed-xfce.kiwi ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.129187870 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.129187870 +0100
@@ -317,6 +317,11 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
+ <package name="aaa_base" replaces="vim-data"/>
+ <ignore name="vim-data"/>
+ <package name="aaa_base" replaces="vim"/>
+ <ignore name="vim"/>
+ <package name="vim-small"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.197187730 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.197187730 +0100
@@ -154,7 +154,7 @@
# boo#1039756
[ "$desktop" = "gnome" ] && baseUpdateSysConfig /etc/sysconfig/windowmanager
DEFAULT_WM gnome
-#Disable journal write to disk in live mode, bug 950999
+# Disable journal write to disk in live mode, bug 950999
echo "Storage=volatile" >> /etc/systemd/journald.conf
# Remove generated files (boo#1098535)
@@ -163,7 +163,6 @@
# 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.
++++++ list-common.sh ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.217187689 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.217187689 +0100
@@ -190,12 +190,20 @@
# Pulls in tcl
buildignore usb_modeswitch
+# Make vim smaller
+buildignore vim-data
+if [ "$distro" = "tumbleweed" ]; then
+ buildignore vim
+ install vim-small
+fi
+
# This was previously required by base
install patterns-yast-yast2_basis
installPattern yast2_basis
# This was previously required by rest_cd_core
install kernel-default
+# The compressed (-all) version results in a bigger .iso!
install kernel-firmware
install patterns-base-enhanced_base
installPattern enhanced_base
++++++ list-gnome.sh ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.241187639 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.241187639 +0100
@@ -44,9 +44,6 @@
# Pulls in color management tools
buildignore gnome-control-center-color
-# We need space - more space
-buildignore vim-data
-
# 17 MiB, really?
buildignore libgweather-lang
buildignore gnome-user-docs
++++++ list-x11.sh ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.285187549 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.289187541 +0100
@@ -47,11 +47,6 @@
buildignore fprintd
buildignore accountsservice
buildignore MozillaFirefox
-buildignore vim-data
-if [ "$distro" = "tumbleweed" ]; then
- buildignore vim
- install vim-small
-fi
buildignore tcpdump
install gparted
++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.w9MQ8M/_old 2020-11-04 11:07:26.345187425 +0100
+++ /var/tmp/diff_new_pack.w9MQ8M/_new 2020-11-04 11:07:26.345187425 +0100
@@ -50,7 +50,7 @@
else
name="${distroname} ${uppercaseflavor} Live"
fi
-
+
PACKAGES="\n <!-- list-common.sh -->"
. "$PWD/list-common.sh"
PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
