diff --git a/config.sh b/config.sh
index b08a0c4..ee8c21f 100644
--- a/config.sh
+++ b/config.sh
@@ -70,7 +70,7 @@ zypper --non-interactive rm yast2-trans-{uk,sv,ru,ja,da,cs,sr,vi} || :
rm -rf /usr/share/doc/packages/*
# Save 50 MiB by removing this, not very useful for lives
-rm -rf /lib/firmware/{liquidio,netronome}
+rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl}
# Add repos from /etc/YaST2/control.xml
add-yast-repos
diff --git a/list-common.sh b/list-common.sh
index e48110e..1043d37 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -2,6 +2,7 @@ buildignore poppler-data
buildignore tin
buildignore desktop-translations
buildignore ft2demos
+buildignore gimp-help
buildignore libreoffice-base
buildignore libreoffice-mailmerge
buildignore libreoffice-math
@@ -262,7 +263,6 @@ install xf86-video-tdfx
install xf86-video-tga
install xf86-video-v4l
install xf86-video-vesa
-install xf86-video-vmware i686,x86_64
install xf86-video-voodoo
install xfsdump
install xfsprogs
diff --git a/list-gnome.sh b/list-gnome.sh
index 85d14e2..9f41a84 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -36,13 +36,20 @@ buildignore ghostscript
buildignore myspell-en_US
buildignore orca
+# gnome-software is a nice software center, but on the live medium only of limited use
+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
buildignore gnome-user-docs-lang
+buildignore eog-lang
buildignore evolution-lang
buildignore evolution-data-server-lang
buildignore zenity-lang
@@ -63,9 +70,17 @@ buildignore gnome-weather
install gparted
+buildignore gparted-lang
+buildignore vinagre-lang
+buildignore gedit-lang
+buildignore fwupd-lang
+
# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
buildignore cyrus-sasl
+# Moved here from list-common.sh, too big for x11
+install xf86-video-vmware i686,x86_64
+
# From rest_cd_core
install alsa-firmware
diff --git a/list-kde.sh b/list-kde.sh
index a5071a3..8d891d9 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -43,6 +43,9 @@ buildignore patterns-kde-kde_games
buildignore patterns-kde-kde_utilities
install kcharselect
+# Moved here from list-common.sh, too big for x11
+install xf86-video-vmware i686,x86_64
+
# No PIM
buildignore patterns-kde-kde_pim
@@ -52,6 +55,7 @@ buildignore libproxy1-pacrunner-webkit
buildignore digikam
buildignore hugin
buildignore gimp-lang
+buildignore kate-lang
install partitionmanager
diff --git a/list-x11.sh b/list-x11.sh
index 5d0306c..905c274 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -33,6 +33,9 @@ buildignore Mesa-libva
# No python2 necessary
buildignore python-base
+# Pulls in libpython2_7
+buildignore libpeas-loader-python
+
buildignore aspell-en
buildignore ModemManager
buildignore yast2-printer
@@ -42,9 +45,13 @@ buildignore accountsservice
buildignore MozillaFirefox
buildignore gcc8
buildignore vim-data
+buildignore tcpdump
install gparted
install midori
+# Really ran of out space
+buildignore gparted-lang
+buildignore midori-lang
# 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 c45c262..8e7c10c 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -33,6 +33,9 @@ buildignore libreoffice
# Pulls in sane-backends
buildignore simple-scan
+# Moved here from list-common.sh, too big for x11
+install xf86-video-vmware i686,x86_64
+
# make sure pdf support for xreader is installed
install xreader-plugin-pdfdocument
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index bef0397..e1b3489 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -467,14 +468,20 @@
+
+
+
+
+
+
@@ -496,8 +503,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index a51ed5f..b1de243 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -473,6 +474,7 @@
+
@@ -487,6 +489,8 @@
+
+
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 9ae9cb1..1562ad0 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -470,6 +471,8 @@
+
+
@@ -488,8 +491,14 @@
+
+
+
+
+
+
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 3f5e322..0b57d9a 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt
+
+- list-x11: Block libpeas-loader-python to avoid libpython2_7
+- Fix pkg-diff for prjs with multiple repos
+- Move xf86-video-vmware from list-common to list-{gnome,kde,xfce}
+
+-------------------------------------------------------------------
+Mon Sep 30 09:08:32 UTC 2019 - Dominique Leuenberger
+
+- list-x11: drop tcpdump
+
+-------------------------------------------------------------------
+Mon Sep 30 08:43:48 UTC 2019 - Dominique Leuenberger
+
+- list-kde: shrink a little bit, drop kate-lang (again)
+
+-------------------------------------------------------------------
+Mon Sep 30 07:43:33 UTC 2019 - Dominique Leuenberger
+
+- list-gnome: drop gnome-software: SW Center is a nice to have, but on the live
+ medium of limited use.
+
+-------------------------------------------------------------------
+Wed Sep 25 10:29:05 UTC 2019 - Dominique Leuenberger
+
+- list-gnome: ignore eog-lang and vim-data
+
+-------------------------------------------------------------------
+Wed Sep 25 09:25:28 UTC 2019 - Dominique Leuenberger
+
+- Block gimp-help from the Live images
+
+-------------------------------------------------------------------
+Mon Sep 16 17:37:10 UTC 2019 - Yuchen Lin
+
+- list-x11: ignore midori-lang and gparted-lang
+- list-gnome: ignore some more packages on GNOME Live
+ * gparted-lang, vinagre-lang, gedit-lang and fwupd-lang
+
-------------------------------------------------------------------
Mon Sep 16 06:52:25 UTC 2019 - Fabian Vogt
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 7424747..11fe250 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -467,14 +468,20 @@
+
+
+
+
+
+
@@ -496,8 +503,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index fbc230d..66ef5d9 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -473,6 +474,7 @@
+
@@ -487,6 +489,8 @@
+
+
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 3c69c95..5c17d8f 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -470,6 +471,8 @@
+
+
@@ -488,8 +491,14 @@
+
+
+
+
+
+
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 2db638f..a58d460 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -65,6 +65,8 @@
+
+
@@ -380,7 +382,6 @@
-
@@ -460,6 +461,7 @@
+
diff --git a/pkg-diff.sh b/pkg-diff.sh
index 701c2b4..99576b2 100644
--- a/pkg-diff.sh
+++ b/pkg-diff.sh
@@ -12,7 +12,7 @@ fetch_pkglist() {
local package=$2
local repo=$3
local arch=$4
- local binaryname=$(osc ls -b ${project} ${package} -a ${arch} | grep .packages | xargs)
+ 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 $1 }' | sort -u
}