config:sync tumbleweed

configs/tumbleweed.conf

@@ -131,9 +131,7 @@ Substitute: netcfg netcfg libnss_usrfiles2
   BuildFlags: useccache:bitcoin
   BuildFlags: useccache:ceph
   BuildFlags: useccache:chromium
-  BuildFlags: useccache:glib2
   BuildFlags: useccache:gtk3
-  BuildFlags: useccache:gtk3:doc
   BuildFlags: useccache:llvm9
   BuildFlags: useccache:nodejs-electron
   buildflags: useccache:tensorflow
@@ -145,8 +143,9 @@ Substitute: netcfg netcfg libnss_usrfiles2
   buildflags: useccache:tensorflow:hpc-openmpi2
   buildflags: useccache:tensorflow:lite
   buildflags: useccache:tensorflow:standard
-# ccache 4.x breaks webkit2gtk3
-#BuildFlags: useccache:webkit2gtk3
+  BuildFlags: useccache:webkit2gtk3:gtk3
+  BuildFlags: useccache:webkit2gtk3:gtk3-soup2
+  BuildFlags: useccache:webkit2gtk3:gtk4
 %endif
 
 # switch to kiwi v8
@@ -164,10 +163,13 @@ Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel
 Preinstall: liblua5_4-5
 
 FileProvides: /bin/bash bash
+FileProvides: /usr/bin/bash bash
 FileProvides: /bin/sh bash-sh busybox-sh
+FileProvides: /usr/bin/sh bash-sh busybox-sh
 Prefer: bash-sh
 FileProvides: /bin/csh tcsh
 FileProvides: /bin/hostname hostname busybox-hostname
+Prefer: -busybox-hostname
 FileProvides: /usr/bin/hostname hostname busybox-hostname
 FileProvides: /bin/logger util-linux-systemd
 FileProvides: /sbin/netconfig sysconfig-netconfig
@@ -227,7 +229,15 @@ Preinstall: libpopt0 libelf1 libpcre1 libzstd1 libpcre2-8-0
 Prefer: libdb-4_8-devel
 VMinstall: util-linux libmount1 perl-base libdb-4_8 libblkid1 libuuid1 libsmartcols1 libcrypt1
 VMinstall: kernel-obs-build
-VMInstall: iproute2 libmnl0
+# iproute seems not to be used anymore nowadays; the builders have working localnet without it
+# and on OBS we don't support 'network' access anyway, so the rest of the config is never reached
+# 2022-03-23 - dimstar
+# VMInstall: iproute2 libmnl0
+
+# Add hostname so that OBS/build will have a chance to identify the hostname (instead of localhost)
+# build has alternative ways to inject hostname nowadays - removed 2022-03-23 - dimstar
+#Support: hostname
+#Prefer: -busybox-hostname
 
 # Use the x86_64 kernel on i586 builds - boo#1178762 - Slow down in OBS since kernel 5.6.0 on 32bit
 ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
@@ -266,6 +276,34 @@ ExportFilter: ^flash-player.*\.i586.rpm$ . x86_64
 ExportFilter: ^novell-messenger-client.*\.i586.rpm$ . x86_64
 ExportFilter: ^openCryptoki-32bit.*\.s390.rpm$ . s390x
 
+############
+# For QEMU #
+############
+#
+# Firmwares are built (if possible) once per "port". This reduces build time, e.g., as compared
+# to cross-compiling everything on everything, and improve consistency, while keeping things self
+# contained, within ports, which is especially important for openSUSE:Factory
+#
+# ### x86 firmwares
+# They are built on: x86_64 and aarch64. The x86_64 build can then be imported in i586, and the
+# aarch64 one in armv7l. We're not yet able to build them on any PPC arch (but are working on it)
+# so, for this devel project, we're exporting them there too (and for Factory, we have an aggregate).
+# We're also not able to build them on zsystem and riscv, so export them there as well, here in the
+# devel project (for Factory, we just miss them in s390, while riscv is special in its own way).
+ExportFilter: ^qemu-ipxe.*\.noarch\.rpm$ . i586 armv7l ppc ppc64 ppc64le s390x riscv64
+ExportFilter: ^qemu-seabios.*\.noarch\.rpm$ . i586 armv7l ppc ppc64 ppc64le s390x riscv64
+ExportFilter: ^qemu-vgabios.*\.noarch\.rpm$ . i586 armv7l ppc ppc64 ppc64le s390x riscv64
+ExportFilter: ^qemu-sgabios.*\.noarch\.rpm$ . i586 armv7l ppc ppc64 ppc64le s390x riscv64
+# ### PPC firmwares
+# They are built on: x86_64, aarch64 and ppc64le. The x86_build can then by imported in i586, the
+# aarch64 one in armv7l and the ppc64le one in ppc and ppc64. As for the x86 firmwares, here in the
+# devel project, we export them directly to all the arch-es that can't build them, just for convenience.
+ExportFilter: ^qemu-skiboot.*\.noarch\.rpm$ . i586 armv7l ppc s390x riscv64
+ExportFilter: ^qemu-SLOF.*\.noarch\.rpm$ . i586 armv7l ppc s390x riscv64
+# TODO: does the 'qemu-edk2' package still exist?
+ExportFilter: ^qemu-edk2.*\.noarch\.rpm$ .    i586 armv7l aarch64 ppc ppc64 ppc64le s390x riscv64
+ExportFilter: ^qemu-microvm.*\.noarch\.rpm$ . i586 armv7l aarch64 ppc ppc64 ppc64le s390x riscv64
+
 Required: rpm-build
 # Build all packages with -pie enabled
 Required: gcc-PIE
@@ -277,9 +315,6 @@ Prefer:  build-mkbaselibs
 Support: brp-check-suse
 Support: post-build-checks
 
-# Add hostname so that OBS/build will have a chance to identify the hostname (instead of localhost)
-Support: hostname
-Prefer: -busybox-hostname
 # remove build-compare support to disable "same result" package dropping
 Support: build-compare
 
@@ -343,7 +378,7 @@ Prefer: ghostscript-mini
 Prefer: krb5-mini krb5-mini-devel
 Prefer: krb5-mini-devel:krb5-mini
 Prefer: libdebuginfod1 debuginfod-client
-Prefer: libudev-mini-devel libudev-mini1 udev-debuginfo libudev1-debuginfo
+Prefer: libudev-mini1 udev-debuginfo libudev1-debuginfo
 Prefer: libuna-mini-devel libuna1-mini
 Prefer: libunbound-devel-mini
 Prefer: tomcat:log4j12
@@ -368,6 +403,7 @@ Ignore: postgresql12-devel-mini:this-is-only-for-build-envs
 Ignore: postgresql13-devel-mini:this-is-only-for-build-envs
 Ignore: postgresql14-devel-mini:this-is-only-for-build-envs
 Ignore: systemd-mini:this-is-only-for-build-envs
+Ignore: systemd-mini-container:this-is-only-for-build-envs
 Ignore: udev-mini:this-is-only-for-build-envs
 
 # Ring0 packages should not pull in 'info' - making the base VM smaller
@@ -427,10 +463,13 @@ Prefer: -cyrus-sasl-bdb-devel
 Prefer: spamassassin:curl
 
 # Python3 exists in multiple versions - we currently favor 3.8 (our default):
-Prefer: -python36 -python39
+Prefer: -python39
 Prefer: -python39-hotdoc
 Prefer: -python39-txt2tags -python310-txt2tags
 
+# have choice for python3-magic: python38-magic python38-python-magic
+Prefer: -python38-magic -python39-magic -python310-magic
+
 # have choice for (python36-qt5 or python36-PyQt6) needed by python36-pytest-qt
 Prefer: -python39-PyQt6 -python38-PyQt6 -python3-pyside2
 # man and mandoc provide man; mandoc claims to be lightweight, but it was never discussed to be the new default
@@ -439,6 +478,9 @@ Prefer: man
 # go exists in mutliple versions by now - we prefer the 'unversioned package'
 Prefer: go -go1.13
 
+# have choice for kernel >= 4.1.0 needed by libbcc0: kernel-debug kernel-default kernel-default-base kernel-kvmsmall kernel-vanilla
+Prefer: kernel-default-base
+
 # have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up)
 Prefer: -kubernetes1.18-kubelet-common -kubernetes1.19-kubelet-common -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common
 
@@ -449,9 +491,8 @@ Prefer: -python38-html2text -python39-html2text -python310-html2text
 Prefer: -budgie-desktop
 
 # python-tornado exists in multiple versions, the meta-package python-tornado defines the system default
-Prefer: -python36-tornado5
-Prefer: python38-tornado -python38-tornado5
-Prefer: python39-tornado -python39-tornado5
+Prefer: python38-tornado
+Prefer: python39-tornado
 Prefer: python310-tornado
 
 # There are multiple PK backends available. Favor the openSUSE own zypp backend
@@ -496,7 +537,7 @@ Prefer: php8:php8-cli
 
 # azure-cli reports: have choice for python3-vsts needed by python3-azure-functions-devops-build: python3-azure-devops python3-vsts
 # Use the real package name
-Prefer: python36-vsts python38-vsts python39-vsts
+Prefer: python38-vsts python39-vsts
 
 # have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service
 Prefer: -NetworkManager
@@ -727,7 +768,6 @@ Prefer: -libkms-devel-32bit
 Prefer: -liblbxutil-devel-32bit
 Prefer: -liblcms2-devel-32bit
 Prefer: -libmount-devel-32bit
-Prefer: -libnetapi-devel-32bit
 Prefer: -libnettle-devel-32bit
 Prefer: -libnl3-devel-32bit
 Prefer: -libnotify-devel-32bit
@@ -780,7 +820,6 @@ Prefer: -libstatgrab-devel-32bit
 Prefer: -libstdc++-devel-32bit
 Prefer: -libtasn1-devel-32bit
 Prefer: -libtiff-devel-32bit
-Prefer: -libudev-devel-32bit
 Prefer: -libunistring-devel-32bit
 Prefer: -libusb-1_0-devel-32bit
 Prefer: -libuuid-devel-32bit
@@ -802,7 +841,6 @@ Prefer: -libxkbui-devel-32bit
 Prefer: -libxml2-devel-32bit
 Prefer: -libxslt-devel-32bit
 Prefer: -libyajl-devel-32bit
-Prefer: -libyaz-devel-32bit
 Prefer: -libzstd-devel-32bit
 Prefer: -llvm10-LTO-devel-32bit
 Prefer: -llvm10-devel-32bit
@@ -862,14 +900,7 @@ Prefer: -zvbi-devel-32bit
 Prefer: -zziplib-devel-32bit
 
 # Ruby stuff - quite a few packages exist in multiple versions in the distro; in each case, the Preference is on the 'unversioned' package
-Prefer: ruby2.7-rubygem-fast_gettext ruby3.1-rubygem-fast_gettext
-Prefer: ruby2.7-rubygem-i18n
-Prefer: ruby2.7-rubygem-rack
-Prefer: ruby2.7-rubygem-sass-rails
-Prefer: ruby2.7-rubygem-sassc
-Prefer: ruby2.7-rubygem-thor
-Prefer: ruby2.7-rubygem-listen ruby2.7-rubygem-mime-types ruby2.7-rubygem-builder
-Prefer: -ruby2.7-rubygem-puma-4
+Prefer: ruby3.1-rubygem-fast_gettext
 
 # We have opencv and opencv3 - as usual, the unversioned one should win
 Prefer: opencv-devel
@@ -908,7 +939,7 @@ Prefer: syslog-service
 Prefer: poppler-tools
 Prefer: libjpeg8-devel libjpeg-turbo
 Prefer: microcode_ctl:kernel-default
-Prefer: gnu-jaf yast2-control-center-qt
+Prefer: yast2-control-center-qt
 Prefer: wine
 Prefer: ndesk-dbus ndesk-dbus-glib tomcat-jsp-2_3-api
 Prefer: -servletapi4 -servletapi5
@@ -920,8 +951,6 @@ Prefer: librest-0_7-0
 
 Prefer: -geronimo-jta-1_0_1B-api -geronimo-jms-1_1-api -geronimo-el-1_0-api -geronimo-jta-1_1-api javamail
 Prefer: rhino:xmlbeans-mini
-Prefer: mx4j:log4j12-mini
-Prefer: maven-doxia-module-fo:log4j12-mini
 
 Prefer: rpcbind
 Prefer: wicked-service
@@ -1359,7 +1388,7 @@ Prefer: %{rb_default_ruby_suffix}-rubygem-inifile
 Prefer: %{rb_default_ruby_suffix}-rubygem-mini_portile2
 Prefer: %{rb_default_ruby_suffix}-rubygem-ronn
 Prefer: %{rb_default_ruby_suffix}-rubygem-rspec
-Prefer: -ruby3.0-rubygem-rspec-3_5 -ruby2.7-rubygem-rspec-3_5 -ruby3.1-rubygem-rspec-3_5
+Prefer: -ruby3.1-rubygem-rspec-3_5
 Prefer: %{rb_default_ruby_suffix}-rubygem-ruby-dbus
 Prefer: %{rb_default_ruby_suffix}-rubygem-sass
 Prefer: %{rb_default_ruby_suffix}-rubygem-sass-rails