Skip to content

Commit adf1ba7

Browse files
authored
Tumbleweed config: enable preinstallexpand (openSUSE#1011)
* Tumbleweed config: enable preinstallexpand * Sync config with openSUSE:Factory
1 parent dca0e07 commit adf1ba7

File tree

1 file changed

+21
-27
lines changed

1 file changed

+21
-27
lines changed

configs/tumbleweed.conf

+21-27
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ExpandFlags: macroserial:20240529
1111

1212
ExpandFlags: kiwi-nobasepackages
1313
ExpandFlags: docker-nobasepackages
14-
1514
PublishFlags: ympdist:openSUSE%20Tumbleweed
1615

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

9190
%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"
9291
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict
93-
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
92+
Substitute: system-packages:docker docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
9493
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
9594
%else
9695
# That ignore seems not to make sense - we only inject -strict based on specific projects already
@@ -187,8 +186,6 @@ Prefer: liblua5_4-5 liblua5_3-5 liblua5_1-5
187186
Prefer: %{lua_pref}-devel lua53-devel lua51-devel
188187
Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel
189188

190-
Preinstall: liblua5_4-5
191-
192189
ExpandFlags: keepfilerequires
193190

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

578-
# have choice for chromedriver needed by openQA-devel: chromedriver ungoogled-chromium-chromedriver
579-
Prefer: -ungoogled-chromium-chromedriver
580-
581575
# have choice for pkgconfig(libmarkdown): libmarkdown-devel libmarkdown2-devel
582576
Prefer: -libmarkdown2-devel
583577

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

627-
#---
621+
# have choice for cmake(cmocka): libcmocka-cmake libcmocka-cmake-32bit
622+
Prefer: -libcmocka-cmake-32bit
628623

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

635-
#Runscripts: aaa_base
627+
#---
636628

637-
Prefer: libdb-4_8-devel
638-
VMinstall: util-linux libmount1 libeconf0 perl-base libdb-4_8 libblkid1 libuuid1 libsmartcols1 libcrypt1
629+
ExpandFlags: preinstallexpand
630+
Preinstall: rpm
631+
632+
VMinstall: perl-base
633+
VMinstall: util-linux
634+
# bootstrap-copy is an aggregate-only repository, no VMs are built up
635+
%if "%_repository" != "bootstrap_copy"
639636
VMinstall: kernel-obs-build
637+
%endif
640638

641639
# Use the x86_64 kernel on i586 builds - boo#1178762 - Slow down in OBS since kernel 5.6.0 on 32bit
642640
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
@@ -751,7 +749,6 @@ Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
751749
Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream
752750
Prefer: NetworkManager:NetworkManager-branding-openSUSE
753751
Prefer: PackageKit:PackageKit-branding-upstream
754-
Prefer: sddm:sddm-branding-upstream
755752
Prefer: sway:sway-branding-upstream
756753
Prefer: systemd-presets-branding-openSUSE
757754
Prefer: wallpaper-branding-openSUSE
@@ -872,8 +869,6 @@ Conflict: systemd-mini-devel:systemd
872869
# Cmake exists as a -mini flavor, which is not linked against curl.
873870
Prefer: cmake-mini
874871

875-
Prefer: -re2-10-devel
876-
877872
# python-pip inside OBS never connects to the net, so we don't use certs
878873
Ignore: python310-pip:ca-certificates
879874
Ignore: python311-pip:ca-certificates
@@ -953,7 +948,6 @@ Prefer: -libpxbackend-1_0
953948
Prefer: -scout-command-not-found
954949

955950
# have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up)
956-
Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common
957951
Prefer: -kubernetes1.24-client-common -kubernetes1.25-client-common
958952

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

1025-
# have choice for container:opensuse/nginx:latest: container:opensuse-nginx-1.25 container:opensuse-nginx-image
1026-
Prefer: -container:opensuse-nginx-1.25
1027-
10281019
# have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service
10291020
Prefer: -NetworkManager
10301021

@@ -1041,7 +1032,7 @@ Prefer: nodejs-default nodejs-devel-default npm-default
10411032
Prefer: -libhs5-vectorscan5
10421033

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

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

15061495
Ignore: installation-images-openSUSE:cracklib-dict-full
15071496
Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
@@ -1814,6 +1803,7 @@ BuildFlags: onlybuild:deltarpm
18141803
BuildFlags: onlybuild:desktop-file-utils
18151804
BuildFlags: onlybuild:devscripts
18161805
BuildFlags: onlybuild:devscripts:checkbashisms
1806+
BuildFlags: onlybuild:dhcp
18171807
BuildFlags: onlybuild:dialog
18181808
BuildFlags: onlybuild:diffutils
18191809
BuildFlags: onlybuild:dirac
@@ -2039,6 +2029,7 @@ BuildFlags: onlybuild:kmod
20392029
BuildFlags: onlybuild:knotifications
20402030
BuildFlags: onlybuild:krb5
20412031
BuildFlags: onlybuild:krb5:krb5-mini
2032+
BuildFlags: onlybuild:kronosnet
20422033
BuildFlags: onlybuild:kservice
20432034
BuildFlags: onlybuild:kwallet
20442035
BuildFlags: onlybuild:kwidgetsaddons
@@ -2618,6 +2609,7 @@ BuildFlags: onlybuild:perl-Syntax-Keyword-Try
26182609
BuildFlags: onlybuild:perl-Term-ReadKey
26192610
BuildFlags: onlybuild:perl-Term-Table
26202611
BuildFlags: onlybuild:perl-Test-Base
2612+
BuildFlags: onlybuild:perl-Test-Cmd
26212613
BuildFlags: onlybuild:perl-Test-CPAN-Meta
26222614
BuildFlags: onlybuild:perl-Test-Deep
26232615
BuildFlags: onlybuild:perl-Test-Differences
@@ -3020,12 +3012,13 @@ BuildFlags: onlybuild:rubygem-rdiscount
30203012
BuildFlags: onlybuild:rubygem-ronn
30213013
BuildFlags: onlybuild:rust
30223014
BuildFlags: onlybuild:rust-bindgen
3023-
BuildFlags: onlybuild:rust1.73
3015+
BuildFlags: onlybuild:rust-cbindgen
30243016
BuildFlags: onlybuild:rust1.74
30253017
BuildFlags: onlybuild:rust1.75
30263018
BuildFlags: onlybuild:rust1.76
30273019
BuildFlags: onlybuild:rust1.77
30283020
BuildFlags: onlybuild:rust1.78
3021+
BuildFlags: onlybuild:rust1.79
30293022
BuildFlags: onlybuild:samba
30303023
BuildFlags: onlybuild:sane-backends
30313024
BuildFlags: onlybuild:sassc
@@ -3155,6 +3148,7 @@ BuildFlags: onlybuild:tpm2-0-tss
31553148
BuildFlags: onlybuild:tracker
31563149
BuildFlags: onlybuild:transfig
31573150
BuildFlags: onlybuild:translation-update-upstream
3151+
BuildFlags: onlybuild:tree
31583152
BuildFlags: onlybuild:tslib
31593153
BuildFlags: onlybuild:ttf-converter
31603154
BuildFlags: onlybuild:twolame

0 commit comments

Comments
 (0)