diff --git a/config.sh b/config.sh
index add0796..4af0242 100644
--- a/config.sh
+++ b/config.sh
@@ -34,7 +34,7 @@ rpm -qa | grep "^cpp" | xargs -r rpm -e --nodeps
# GTK 3 hard-requires this for some reason. The only GTK3 application is Firefox,
# which has its own icons and we have breeze for the rest.
-[ "$desktop" = "kde" -o "$desktop" = "x11" ] && rpm -e --nodeps adwaita-icon-theme
+[ "$desktop" = "kde" ] && rpm -e --nodeps adwaita-icon-theme
# Workaround until dropped from xfce4-branding-openSUSE
[ "$desktop" = "x11" -o "$desktop" = "xfce" ] && rpm -e --nodeps noto-coloremoji-fonts
@@ -78,7 +78,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}
+rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress}
# Add repos from /etc/YaST2/control.xml
add-yast-repos
diff --git a/list-common.sh b/list-common.sh
index 94436d6..47e98d8 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -43,6 +43,7 @@ buildignore patterns-desktop-multimedia_opt
buildignore patterns-openSUSE-non_oss_opt
buildignore patterns-office-office_opt
buildignore patterns-base-x11_opt
+buildignore patterns-base-x11_enhanced
buildignore make
buildignore netpbm
buildignore p7zip-full
@@ -232,7 +233,6 @@ install dosfstools
install e2fsprogs
install efibootmgr
install gtk2-branding-openSUSE
-install insserv
install ipw-firmware
install iw
install jfsutils
diff --git a/list-x11.sh b/list-x11.sh
index 7109818..ada59fd 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -20,6 +20,8 @@ buildignore nano-lang
buildignore zenity-lang
buildignore gsettings-desktop-schema-lang
buildignore gvfs-lang
+buildignore libstorage-ng-lang
+buildignore joe
buildignore libgphoto2-6-lang
buildignore alsa
buildignore alsa-firmware
@@ -36,6 +38,7 @@ buildignore Mesa-libva
# No python2 necessary
buildignore python-base
+buildignore python38-pip
# Pulls in libpython2_7
buildignore libpeas-loader-python
@@ -91,10 +94,8 @@ install ristretto
install thunar
install thunar-volman
install xfce4-appfinder
-install xfce4-mixer
install xfce4-notifyd
install xfce4-panel
-install xfce4-panel-plugin-mixer
install xfce4-power-manager
install xfce4-session
install xfce4-settings
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index b20e505..5feb86e 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -350,7 +352,6 @@
-
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 98f90e3..c6c7a7a 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -350,7 +352,6 @@
-
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 7b46455..cfaf4cd 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -350,7 +352,6 @@
-
@@ -456,6 +457,10 @@
+
+
+
+
@@ -482,6 +487,8 @@
+
+
@@ -549,10 +556,8 @@
-
-
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 21c4268..02a6b6d 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Fri Feb 12 13:45:40 UTC 2021 - Fabian Vogt
+
+- list-common: Drop insserv, ignore patterns-base-x11_enhanced. On TW,
+ it was ignored because of the xorg-x11-essentials block anyway.
+
+-------------------------------------------------------------------
+Fri Jan 22 11:44:45 UTC 2021 - Dominique Leuenberger
+
+- Remove recommended python38-pip from RescueCD.
+
+-------------------------------------------------------------------
+Sun Jan 17 10:25:00 UTC 2021 - Dominique Leuenberger
+
+- Drop joe from the RescueCD: we have vim-small, and one text
+ editor is enough (no space left).
+- Drop libstorage-ng-lang: no spaceleft on the rescue CD.
+
+-------------------------------------------------------------------
+Wed Jan 13 13:42:35 UTC 2021 - Dominique Leuenberger
+
+- No longer remove adwaita-icon-theme on x11 Rescue CD: xfce 4.16's
+ updated icon theme inherits Adwaita (boo#1180853).
+
+-------------------------------------------------------------------
+Tue Jan 12 07:33:10 UTC 2021 - Dominique Leuenberger
+
+- Drop xfce4-mixer from x11 flavor: not even the xfce flavor
+ installs this anymore.
+
-------------------------------------------------------------------
Fri Nov 27 12:49:12 UTC 2020 - Fabian Vogt
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 2065efd..771181e 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -353,7 +355,6 @@
-
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index ad8680f..84e4e15 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -353,7 +355,6 @@
-
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index a11ea1a..f905059 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -353,7 +355,6 @@
-
@@ -450,6 +451,10 @@
+
+
+
+
@@ -476,6 +481,8 @@
+
+
@@ -543,10 +550,8 @@
-
-
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 9d4b530..ac61665 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -147,6 +147,8 @@
+
+
@@ -353,7 +355,6 @@
-
diff --git a/pkg-diff.sh b/pkg-diff.sh
index 281e117..b116275 100644
--- a/pkg-diff.sh
+++ b/pkg-diff.sh
@@ -14,7 +14,7 @@ fetch_pkglist() {
local arch=$4
local binaryname=$(osc ls -b ${project} ${package} -a ${arch} -r ${repo} | grep .packages | xargs)
- osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ print printf "%s-%s-%s\n", $1, $3, $4 }' | sort -u
+ osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ printf "%s-%s-%s\n", $1, $3, $4 }' | sort -u
}
tmpdir=$(mktemp -d)