Skip to content

Commit

Permalink
Tumbleweed config: enable preinstallexpand (#1011)
Browse files Browse the repository at this point in the history
* Tumbleweed config: enable preinstallexpand

* Sync config with openSUSE:Factory
  • Loading branch information
DimStar77 authored Jul 5, 2024
1 parent dca0e07 commit adf1ba7
Showing 1 changed file with 21 additions and 27 deletions.
48 changes: 21 additions & 27 deletions configs/tumbleweed.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ExpandFlags: macroserial:20240529

ExpandFlags: kiwi-nobasepackages
ExpandFlags: docker-nobasepackages

PublishFlags: ympdist:openSUSE%20Tumbleweed

# Use ext4 as FS in builder workers (instead of default ext3)
Expand Down Expand Up @@ -90,7 +89,7 @@ Macros:

%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86"
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
Substitute: system-packages:docker docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
%else
# That ignore seems not to make sense - we only inject -strict based on specific projects already
Expand Down Expand Up @@ -187,8 +186,6 @@ Prefer: liblua5_4-5 liblua5_3-5 liblua5_1-5
Prefer: %{lua_pref}-devel lua53-devel lua51-devel
Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel

Preinstall: liblua5_4-5

ExpandFlags: keepfilerequires

# Generated by openSUSE-release-tools/repo2fileprovides.py
Expand Down Expand Up @@ -575,9 +572,6 @@ Prefer: -cni-plugins -cni
# have choice for suse-kernel-rpm-scriptlets: sdbootutil-rpm-scriptlets suse-module-tools-scriptlets
Prefer: -sdbootutil-rpm-scriptlets

# have choice for chromedriver needed by openQA-devel: chromedriver ungoogled-chromium-chromedriver
Prefer: -ungoogled-chromium-chromedriver

# have choice for pkgconfig(libmarkdown): libmarkdown-devel libmarkdown2-devel
Prefer: -libmarkdown2-devel

Expand Down Expand Up @@ -624,19 +618,23 @@ Prefer: -freerdp-devel
# have choice for registries-conf >= 20240408 needed by libcontainers-common: registries-conf-default registries-conf-suse
Prefer: -registries-conf-suse

#---
# have choice for cmake(cmocka): libcmocka-cmake libcmocka-cmake-32bit
Prefer: -libcmocka-cmake-32bit

Preinstall: aaa_base filesystem attr bash bash-sh coreutils diffutils
Preinstall: fillup glibc grep pam permissions rpm rpm-config-SUSE sed tar
Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1
Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1
Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0
#have choice for libcurl.so.4()(64bit) needed by cargo1.79: libcurl-mini4 libcurl4
Prefer: -libcurl-mini4

#Runscripts: aaa_base
#---

Prefer: libdb-4_8-devel
VMinstall: util-linux libmount1 libeconf0 perl-base libdb-4_8 libblkid1 libuuid1 libsmartcols1 libcrypt1
ExpandFlags: preinstallexpand
Preinstall: rpm

VMinstall: perl-base
VMinstall: util-linux
# bootstrap-copy is an aggregate-only repository, no VMs are built up
%if "%_repository" != "bootstrap_copy"
VMinstall: kernel-obs-build
%endif

# 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
Expand Down Expand Up @@ -751,7 +749,6 @@ Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream
Prefer: NetworkManager:NetworkManager-branding-openSUSE
Prefer: PackageKit:PackageKit-branding-upstream
Prefer: sddm:sddm-branding-upstream
Prefer: sway:sway-branding-upstream
Prefer: systemd-presets-branding-openSUSE
Prefer: wallpaper-branding-openSUSE
Expand Down Expand Up @@ -872,8 +869,6 @@ Conflict: systemd-mini-devel:systemd
# Cmake exists as a -mini flavor, which is not linked against curl.
Prefer: cmake-mini

Prefer: -re2-10-devel

# python-pip inside OBS never connects to the net, so we don't use certs
Ignore: python310-pip:ca-certificates
Ignore: python311-pip:ca-certificates
Expand Down Expand Up @@ -953,7 +948,6 @@ Prefer: -libpxbackend-1_0
Prefer: -scout-command-not-found

# 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.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common
Prefer: -kubernetes1.24-client-common -kubernetes1.25-client-common

# have choice for cmake(KWinDBusInterface) >= MACRO: deepin-kwin-devel kwin5-devel
Expand Down Expand Up @@ -1022,9 +1016,6 @@ Prefer: -python310-jupyterlab
Prefer: -python310-nbclassic -python312-nbclassic
prefer: -python310-notebook -python312-notebook

# have choice for container:opensuse/nginx:latest: container:opensuse-nginx-1.25 container:opensuse-nginx-image
Prefer: -container:opensuse-nginx-1.25

# have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service
Prefer: -NetworkManager

Expand All @@ -1041,7 +1032,7 @@ Prefer: nodejs-default nodejs-devel-default npm-default
Prefer: -libhs5-vectorscan5

# have choice for libpulse.so.0 needed by wine-32bit: apulse-32bit libpulse0-32bit - prefering the 'original'
Prefer: libpulse0-32bit libsane1-32bit -pipewire-pulseaudio
Prefer: libpulse0-32bit libsane1-32bit pipewire-pulseaudio

# Have choice for vtk-java/vtk-tcl/python3-vtk needed by vtk-devel
Prefer: vtk-java
Expand Down Expand Up @@ -1500,8 +1491,6 @@ Prefer: libsane1
Prefer: libglfw3
# have choice for (xclip or wl-clipboard) needed by password-store: wl-clipboard xclip
Prefer: -wl-clipboard
# have choice for pkgconfig(libhs): hyperscan-devel vectorscan-devel. hyperscan is no longer free - de-prefer it
Prefer: -hyperscan-devel

Ignore: installation-images-openSUSE:cracklib-dict-full
Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
Expand Down Expand Up @@ -1814,6 +1803,7 @@ BuildFlags: onlybuild:deltarpm
BuildFlags: onlybuild:desktop-file-utils
BuildFlags: onlybuild:devscripts
BuildFlags: onlybuild:devscripts:checkbashisms
BuildFlags: onlybuild:dhcp
BuildFlags: onlybuild:dialog
BuildFlags: onlybuild:diffutils
BuildFlags: onlybuild:dirac
Expand Down Expand Up @@ -2039,6 +2029,7 @@ BuildFlags: onlybuild:kmod
BuildFlags: onlybuild:knotifications
BuildFlags: onlybuild:krb5
BuildFlags: onlybuild:krb5:krb5-mini
BuildFlags: onlybuild:kronosnet
BuildFlags: onlybuild:kservice
BuildFlags: onlybuild:kwallet
BuildFlags: onlybuild:kwidgetsaddons
Expand Down Expand Up @@ -2618,6 +2609,7 @@ BuildFlags: onlybuild:perl-Syntax-Keyword-Try
BuildFlags: onlybuild:perl-Term-ReadKey
BuildFlags: onlybuild:perl-Term-Table
BuildFlags: onlybuild:perl-Test-Base
BuildFlags: onlybuild:perl-Test-Cmd
BuildFlags: onlybuild:perl-Test-CPAN-Meta
BuildFlags: onlybuild:perl-Test-Deep
BuildFlags: onlybuild:perl-Test-Differences
Expand Down Expand Up @@ -3020,12 +3012,13 @@ BuildFlags: onlybuild:rubygem-rdiscount
BuildFlags: onlybuild:rubygem-ronn
BuildFlags: onlybuild:rust
BuildFlags: onlybuild:rust-bindgen
BuildFlags: onlybuild:rust1.73
BuildFlags: onlybuild:rust-cbindgen
BuildFlags: onlybuild:rust1.74
BuildFlags: onlybuild:rust1.75
BuildFlags: onlybuild:rust1.76
BuildFlags: onlybuild:rust1.77
BuildFlags: onlybuild:rust1.78
BuildFlags: onlybuild:rust1.79
BuildFlags: onlybuild:samba
BuildFlags: onlybuild:sane-backends
BuildFlags: onlybuild:sassc
Expand Down Expand Up @@ -3155,6 +3148,7 @@ BuildFlags: onlybuild:tpm2-0-tss
BuildFlags: onlybuild:tracker
BuildFlags: onlybuild:transfig
BuildFlags: onlybuild:translation-update-upstream
BuildFlags: onlybuild:tree
BuildFlags: onlybuild:tslib
BuildFlags: onlybuild:ttf-converter
BuildFlags: onlybuild:twolame
Expand Down

0 comments on commit adf1ba7

Please sign in to comment.