From c3df6cd3ad90b79bd0b1d875a76daff7938d926956e0f2febff688314804a807 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Wed, 4 Nov 2020 09:15:21 +0000
Subject: [PATCH] Accepting request 845916 from
 home:favogt:branches:openSUSE:Factory:Live

- 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

OBS-URL: https://build.opensuse.org/request/show/845916
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=78
---
 config.sh                    |  3 +--
 list-common.sh               | 10 ++++++++++
 list-gnome.sh                |  3 ---
 list-x11.sh                  |  6 +-----
 list-xfce.sh                 |  1 +
 livecd-leap-gnome.kiwi       |  8 ++++++--
 livecd-leap-kde.kiwi         |  6 ++++++
 livecd-leap-x11.kiwi         | 10 ++++++++--
 livecd-openSUSE.changes      | 21 +++++++++++++++++++++
 livecd-tumbleweed-gnome.kiwi | 11 +++++++++--
 livecd-tumbleweed-kde.kiwi   |  9 +++++++++
 livecd-tumbleweed-x11.kiwi   | 16 +++++++++++-----
 livecd-tumbleweed-xfce.kiwi  | 11 +++++++++++
 pre-checkin.sh               |  8 ++++----
 14 files changed, 98 insertions(+), 25 deletions(-)

diff --git a/config.sh b/config.sh
index 89dcf87..f36478e 100644
--- a/config.sh
+++ b/config.sh
@@ -154,7 +154,7 @@ baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER $displaymanager
 # 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 @@ rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random
 # 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.
diff --git a/list-common.sh b/list-common.sh
index 086952b..72069de 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -164,6 +164,8 @@ buildignore yast2-sudo
 
 # systemd-coredump makes no sense on a live image: there are no debuginfo installed
 buildignore systemd-coredump
+buildignore systemd-doc
+buildignore man-pages
 
 # VPNC is no longer
 buildignore NetworkManager-vpnc-gnome
@@ -188,12 +190,20 @@ buildignore open-vm-tools
 # 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
diff --git a/list-gnome.sh b/list-gnome.sh
index d06021f..77e2130 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -44,9 +44,6 @@ buildignore gnome-software
 # 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
diff --git a/list-x11.sh b/list-x11.sh
index 599b526..0f48bdc 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -47,11 +47,6 @@ buildignore avahi
 buildignore fprintd
 buildignore accountsservice
 buildignore MozillaFirefox
-buildignore vim-data
-if [ "$distro" = "tumbleweed" ]; then
-	buildignore vim
-	install vim-small
-fi
 buildignore tcpdump
 
 install gparted
@@ -69,6 +64,7 @@ buildignore exo-lang
 buildignore xfdesktop-lang
 buildignore xfce4-power-manager-lang
 buildignore xorg-x11-fonts-legacy
+buildignore noto-sans-cjk-fonts
 
 # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
 buildignore cyrus-sasl
diff --git a/list-xfce.sh b/list-xfce.sh
index c3164b1..94e8500 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -24,6 +24,7 @@ install libxslt-tools
 # Remove useless xfce panel plugins
 buildignore xfce4-panel-plugin-xkb
 buildignore xfce4-panel-plugin-notes
+buildignore engrampa-lang
 
 # Remove Libreoffice as it's too big
 buildignore libreoffice
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 5714dc2..90f59d8 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
@@ -467,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"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 7a5901b..207f40e 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index ba4c11d..38de878 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
@@ -488,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"/>
@@ -518,6 +522,8 @@
     <ignore name="xfce4-power-manager-lang"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+    <ignore name="noto-sans-cjk-fonts"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 65c6709..a666e71 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Nov  4 08:17:48 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Block systemd-doc and man-pages from all flavors, not only xfce.
+
+-------------------------------------------------------------------
+Fri Oct 30 10:10:31 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Do only use set -u: set -e causes issues with stepping out of the
+  for loop using continue.
+- Skip the for loop early: no reason to calculate the PACKAGES list
+  and then not consume it.
+- Use tr [:lower:] [:upper:] instead of tr a-z A-Z.
+
+-------------------------------------------------------------------
+Wed Oct 14 08:36:12 UTC 2020 - Fabian Vogt <fvogt@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
+
 -------------------------------------------------------------------
 Mon Sep  7 09:07:51 UTC 2020 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index db62dcf..923c08e 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
@@ -458,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"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 0b5cb22..368f7bb 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 7bc4fd8..305b7dc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
@@ -479,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"/>
@@ -512,6 +516,8 @@
     <ignore name="xfce4-power-manager-lang"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+    <ignore name="noto-sans-cjk-fonts"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 7143fb5..dfcc640 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -296,6 +296,10 @@
     <ignore name="yast2-sudo"/>
     <package name="aaa_base" replaces="systemd-coredump"/>
     <ignore name="systemd-coredump"/>
+    <package name="aaa_base" replaces="systemd-doc"/>
+    <ignore name="systemd-doc"/>
+    <package name="aaa_base" replaces="man-pages"/>
+    <ignore name="man-pages"/>
     <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -313,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"/>
@@ -437,6 +446,8 @@
     <ignore name="xfce4-panel-plugin-xkb"/>
     <package name="aaa_base" replaces="xfce4-panel-plugin-notes"/>
     <ignore name="xfce4-panel-plugin-notes"/>
+    <package name="aaa_base" replaces="engrampa-lang"/>
+    <ignore name="engrampa-lang"/>
     <package name="aaa_base" replaces="libreoffice"/>
     <ignore name="libreoffice"/>
     <package name="aaa_base" replaces="simple-scan"/>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 2ec61ad..45c2c6d 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -eu
+set -u
 
 install() {
 	if [ -n "${2-}" ]; then
@@ -42,20 +42,20 @@ for distro in leap tumbleweed; do
 	fi
 
 	for flavor in gnome kde xfce x11; do
-		uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
+		[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
+		uppercaseflavor="$(echo "${flavor}" | tr [:lower:] [:upper:])"
 	
 		if [ "${flavor}" = "x11" ]; then
 			name="${distroname} Rescue CD"
 		else
 			name="${distroname} ${uppercaseflavor} Live"
 		fi
-	
+
 		PACKAGES="\n    <!-- list-common.sh -->"
 		. "$PWD/list-common.sh"
 		PACKAGES="$PACKAGES\n\n    <!-- list-${flavor}.sh -->"
 		. "$PWD/list-${flavor}.sh"
 
-		[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
 		sed "s#@FLAVOR@#${flavor}#g;\
 		     s#@NAME@#${name// /-}#g;\
 		     s#@DISPLAYNAME@#${name}#g;\