Accepting request 741736 from home:favogt:branches:openSUSE:Factory:Live

- 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}

OBS-URL: https://build.opensuse.org/request/show/741736
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=53

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

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

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
 

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
 

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

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
 

livecd-leap-gnome.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -467,14 +468,20 @@
     <ignore name="myspell-en_US"/>
     <package name="aaa_base" replaces="orca"/>
     <ignore name="orca"/>
+    <package name="aaa_base" replaces="gnome-software"/>
+    <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"/>
     <ignore name="gnome-user-docs"/>
     <package name="aaa_base" replaces="gnome-user-docs-lang"/>
     <ignore name="gnome-user-docs-lang"/>
+    <package name="aaa_base" replaces="eog-lang"/>
+    <ignore name="eog-lang"/>
     <package name="aaa_base" replaces="evolution-lang"/>
     <ignore name="evolution-lang"/>
     <package name="aaa_base" replaces="evolution-data-server-lang"/>
@@ -496,8 +503,17 @@
     <package name="aaa_base" replaces="gnome-weather"/>
     <ignore name="gnome-weather"/>
     <package name="gparted"/>
+    <package name="aaa_base" replaces="gparted-lang"/>
+    <ignore name="gparted-lang"/>
+    <package name="aaa_base" replaces="vinagre-lang"/>
+    <ignore name="vinagre-lang"/>
+    <package name="aaa_base" replaces="gedit-lang"/>
+    <ignore name="gedit-lang"/>
+    <package name="aaa_base" replaces="fwupd-lang"/>
+    <ignore name="fwupd-lang"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="alsa-firmware"/>
     <namedCollection name="apparmor"/>
     <namedCollection name="games"/>

livecd-leap-kde.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -473,6 +474,7 @@
     <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
     <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="gdb"/>
@@ -487,6 +489,8 @@
     <ignore name="hugin"/>
     <package name="aaa_base" replaces="gimp-lang"/>
     <ignore name="gimp-lang"/>
+    <package name="aaa_base" replaces="kate-lang"/>
+    <ignore name="kate-lang"/>
     <package name="partitionmanager"/>
     <package name="cifs-utils"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>

livecd-leap-x11.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -470,6 +471,8 @@
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>
     <ignore name="python-base"/>
+    <package name="aaa_base" replaces="libpeas-loader-python"/>
+    <ignore name="libpeas-loader-python"/>
     <package name="aaa_base" replaces="aspell-en"/>
     <ignore name="aspell-en"/>
     <package name="aaa_base" replaces="ModemManager"/>
@@ -488,8 +491,14 @@
     <ignore name="gcc8"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="tcpdump"/>
+    <ignore name="tcpdump"/>
     <package name="gparted"/>
     <package name="midori"/>
+    <package name="aaa_base" replaces="gparted-lang"/>
+    <ignore name="gparted-lang"/>
+    <package name="aaa_base" replaces="midori-lang"/>
+    <ignore name="midori-lang"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>

livecd-openSUSE.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- 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 <dleuenberger@suse.com>
+
+- list-x11: drop tcpdump
+
+-------------------------------------------------------------------
+Mon Sep 30 08:43:48 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- list-kde: shrink a little bit, drop kate-lang (again)
+
+-------------------------------------------------------------------
+Mon Sep 30 07:43:33 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- 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 <dleuenberger@suse.com>
+
+- list-gnome: ignore eog-lang and vim-data
+
+-------------------------------------------------------------------
+Wed Sep 25 09:25:28 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Block gimp-help from the Live images
+
+-------------------------------------------------------------------
+Mon Sep 16 17:37:10 UTC 2019 - Yuchen Lin <mlin+factory@suse.de>
+
+- 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 <fvogt@suse.com>
 

livecd-tumbleweed-gnome.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -467,14 +468,20 @@
     <ignore name="myspell-en_US"/>
     <package name="aaa_base" replaces="orca"/>
     <ignore name="orca"/>
+    <package name="aaa_base" replaces="gnome-software"/>
+    <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"/>
     <ignore name="gnome-user-docs"/>
     <package name="aaa_base" replaces="gnome-user-docs-lang"/>
     <ignore name="gnome-user-docs-lang"/>
+    <package name="aaa_base" replaces="eog-lang"/>
+    <ignore name="eog-lang"/>
     <package name="aaa_base" replaces="evolution-lang"/>
     <ignore name="evolution-lang"/>
     <package name="aaa_base" replaces="evolution-data-server-lang"/>
@@ -496,8 +503,17 @@
     <package name="aaa_base" replaces="gnome-weather"/>
     <ignore name="gnome-weather"/>
     <package name="gparted"/>
+    <package name="aaa_base" replaces="gparted-lang"/>
+    <ignore name="gparted-lang"/>
+    <package name="aaa_base" replaces="vinagre-lang"/>
+    <ignore name="vinagre-lang"/>
+    <package name="aaa_base" replaces="gedit-lang"/>
+    <ignore name="gedit-lang"/>
+    <package name="aaa_base" replaces="fwupd-lang"/>
+    <ignore name="fwupd-lang"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="alsa-firmware"/>
     <namedCollection name="apparmor"/>
     <namedCollection name="games"/>

livecd-tumbleweed-kde.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -473,6 +474,7 @@
     <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
     <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="gdb"/>
@@ -487,6 +489,8 @@
     <ignore name="hugin"/>
     <package name="aaa_base" replaces="gimp-lang"/>
     <ignore name="gimp-lang"/>
+    <package name="aaa_base" replaces="kate-lang"/>
+    <ignore name="kate-lang"/>
     <package name="partitionmanager"/>
     <package name="cifs-utils"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>

livecd-tumbleweed-x11.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -470,6 +471,8 @@
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>
     <ignore name="python-base"/>
+    <package name="aaa_base" replaces="libpeas-loader-python"/>
+    <ignore name="libpeas-loader-python"/>
     <package name="aaa_base" replaces="aspell-en"/>
     <ignore name="aspell-en"/>
     <package name="aaa_base" replaces="ModemManager"/>
@@ -488,8 +491,14 @@
     <ignore name="gcc8"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="tcpdump"/>
+    <ignore name="tcpdump"/>
     <package name="gparted"/>
     <package name="midori"/>
+    <package name="aaa_base" replaces="gparted-lang"/>
+    <ignore name="gparted-lang"/>
+    <package name="aaa_base" replaces="midori-lang"/>
+    <ignore name="midori-lang"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>

livecd-tumbleweed-xfce.kiwi

@@ -65,6 +65,8 @@
     <ignore name="desktop-translations"/>
     <package name="aaa_base" replaces="ft2demos"/>
     <ignore name="ft2demos"/>
+    <package name="aaa_base" replaces="gimp-help"/>
+    <ignore name="gimp-help"/>
     <package name="aaa_base" replaces="libreoffice-base"/>
     <ignore name="libreoffice-base"/>
     <package name="aaa_base" replaces="libreoffice-mailmerge"/>
@@ -380,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -460,6 +461,7 @@
     <ignore name="libreoffice"/>
     <package name="aaa_base" replaces="simple-scan"/>
     <ignore name="simple-scan"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xreader-plugin-pdfdocument"/>
     <package name="alsa-firmware"/>
     <package name="opensuse-welcome"/>

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
 }