From c92da91bc25e6e8b54fe58eee64d92ce624349503e30bd34dadd706f6b79d07d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 22 Jun 2021 07:57:25 +0000
Subject: [PATCH] Accepting request 901289 from
 home:favogt:branches:openSUSE:Factory:Live

- list-common: Ignore providers of smtp_daemon
- list-common: Don't ignore systemd-logger
- config.sh: Drop some more firmware

OBS-URL: https://build.opensuse.org/request/show/901289
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=109
---
 config.sh                    |  2 +-
 list-common.sh               | 13 +++++++------
 livecd-leap-gnome.kiwi       | 14 ++++++++++++--
 livecd-leap-kde.kiwi         | 14 ++++++++++++--
 livecd-leap-x11.kiwi         | 14 ++++++++++++--
 livecd-leap-xfce.kiwi        | 14 ++++++++++++--
 livecd-openSUSE.changes      |  7 +++++++
 livecd-tumbleweed-gnome.kiwi | 14 ++++++++++++--
 livecd-tumbleweed-kde.kiwi   | 14 ++++++++++++--
 livecd-tumbleweed-x11.kiwi   | 14 ++++++++++++--
 livecd-tumbleweed-xfce.kiwi  | 14 ++++++++++++--
 11 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/config.sh b/config.sh
index e7a5c2c..f1b0f5e 100644
--- a/config.sh
+++ b/config.sh
@@ -87,7 +87,7 @@ zypper --non-interactive rm yast2-trans-{uk,sv,ru,ja,da,cs,sr,vi} || :
 rm -rf /usr/share/doc/packages/*
 
 # Save more than 200 MiB by removing this, not very useful for lives
-rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress}
+rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress,dpaa2,bnx2x}
 
 # Not needed, boo#1166406
 rm /boot/vmlinux*.[gx]z
diff --git a/list-common.sh b/list-common.sh
index cba16cd..57c6782 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -176,12 +176,13 @@ buildignore man-pages
 buildignore NetworkManager-vpnc-gnome
 buildignore plasma-nm5-vpnc
 
-# We have NetworkManager instead.
-# Valid only after removal of "Requires: /sbin/ifup" in sysconfig.spec
-# buildignore wicked
-
-# Conflicts with rsyslog otherwise
-buildignore systemd-logger
+# smtp_daemon is recommended by mdadm
+buildignore busybox-sendmail
+buildignore exim
+buildignore msmtp-mta
+buildignore postfix
+buildignore postfix-bdb
+buildignore sendmail
 
 # Can't install this with the latest kernel due to boo#1095148
 # And virtualbox is build failed on i586 in TW - 20180617 maxlin
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 0ec3d15..d514397 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index bf0ce93..0706fdf 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 4703e39..7cacf40 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 5391d19..b0f32ef 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index b9681fb..ba0d1fc 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 22 07:39:59 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Ignore providers of smtp_daemon
+- list-common: Don't ignore systemd-logger
+- config.sh: Drop some more firmware
+
 -------------------------------------------------------------------
 Tue May 25 09:44:02 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 648e0ed..30ab902 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index a47bbdb..eca12f5 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index b702a88..4b7fa65 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 33ec99e..8dc939f 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -310,8 +310,18 @@
     <ignore name="NetworkManager-vpnc-gnome"/>
     <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="systemd-logger"/>
-    <ignore name="systemd-logger"/>
+    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <ignore name="busybox-sendmail"/>
+    <package name="aaa_base" replaces="exim"/>
+    <ignore name="exim"/>
+    <package name="aaa_base" replaces="msmtp-mta"/>
+    <ignore name="msmtp-mta"/>
+    <package name="aaa_base" replaces="postfix"/>
+    <ignore name="postfix"/>
+    <package name="aaa_base" replaces="postfix-bdb"/>
+    <ignore name="postfix-bdb"/>
+    <package name="aaa_base" replaces="sendmail"/>
+    <ignore name="sendmail"/>
     <package name="aaa_base" replaces="virtualbox-guest-tools"/>
     <ignore name="virtualbox-guest-tools"/>
     <package name="aaa_base" replaces="virtualbox-guest-x11"/>