diff --git a/fedora-cloud.conf b/fedora-cloud.conf index 802d60a..a727946 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -1,5 +1,7 @@ # Import general configuration from general.conf from general import * +# Import multilib configuration from multilib.conf +from multilib import * # PRODUCT INFO release_name = 'Fedora-Cloud' diff --git a/fedora-container.conf b/fedora-container.conf index 1fe9898..1508b14 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -1,5 +1,7 @@ # Import general configuration from general.conf from general import * +# Import multilib configuration from multilib.conf +from multilib import * # PRODUCT INFO release_name = 'Fedora-Container' diff --git a/fedora.conf b/fedora.conf index 2bc3176..0728abb 100644 --- a/fedora.conf +++ b/fedora.conf @@ -1,5 +1,7 @@ # Import general configuration from general.conf from general import * +# Import multilib configuration from multilib.conf +from multilib import * # PRODUCT INFO release_name = 'Fedora' diff --git a/general.conf b/general.conf index 6b2f8b5..8737aaa 100644 --- a/general.conf +++ b/general.conf @@ -26,7 +26,6 @@ media_checksum_one_file = True #jigdo create_jigdo = False - # MULTILIB multilib = [ ('^Everything$', { @@ -34,81 +33,6 @@ multilib = [ }) ] -# format: {arch|*: [packages]} -# Sorted alphabetically -multilib_blacklist = { - '*': [ - 'bash-devel', - 'dmraid-devel', - 'ghc-*', - 'httpd-core', - 'httpd-devel', - 'java-*', - 'kdeutils-devel', - 'kernel', - 'kernel*debug*', - 'kernel-PAE*', - 'krb5-server', - 'krb5-server-ldap', - 'mkinitrd-devel', - 'mod_*', - 'mp' - 'php*', - 'php-devel', - 'tomcat-native', - ], -} - -# Note: If you change something here (affects Rawhide/Branched composes), also -# submit the same change to the Bodhi config (affects updates for stable releases), -# we want to keep them in sync: -# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 -# -# format: {arch|*: [packages]} -# Sorted alphabetically -multilib_whitelist = { - '*': [ - '*-static', - 'apitrace-libs', - 'compiler-rt', - 'dssi-vst-wine', - 'fakechroot-libs', - 'fakeroot-libs', - 'glib-networking', - 'glx-utils', - 'ibus-gtk2', - 'ibus-gtk3', - 'ibus-libs', - 'iptables', - 'libflashsupport', - 'libgnat', - 'lmms-vst', - 'mangohud', - 'mariadb-connector-odbc', - 'mesa-vdpau-drivers', - 'mesa-vulkan-drivers', - 'mysql-connector-odbc', - 'nosync', - 'nspluginwrapper', - 'nvidia-query-resource-opengl-lib', - 'p11-kit-trust', - 'pam', - 'perl-libs', - 'pipewire', - 'postgresql-odbc', - 'redhat-lsb', - 'syslinux-extlinux-nonlinux', - 'syslinux-nonlinux', - 'syslinux-tftpboot', - 'systemd-pam', - 'valgrind', - 'vkBasalt', - 'wine', - 'wine-*', - 'yaboot', - ], -} - # ISO IMAGE image_volid_layered_product_formats = [] diff --git a/multilib.conf b/multilib.conf new file mode 100644 index 0000000..76c9130 --- /dev/null +++ b/multilib.conf @@ -0,0 +1,81 @@ +# MULTILIB + +# Note: If you change something here (affects Rawhide/Branched composes), also +# submit the same change to the Bodhi config (affects updates for stable releases), +# we want to keep them in sync: +# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/files/pungi_multilib.conf +# +# format: {arch|*: [packages]} +# Sorted alphabetically +multilib_blacklist = { + '*': [ + 'bash-devel', + 'dmraid-devel', + 'ghc-*', + 'httpd-core', + 'httpd-devel', + 'java-*', + 'kdeutils-devel', + 'kernel', + 'kernel*debug*', + 'kernel-PAE*', + 'krb5-server', + 'krb5-server-ldap', + 'mkinitrd-devel', + 'mod_*', + 'mp' + 'php*', + 'php-devel', + 'tomcat-native', + ], +} + +# Note: If you change something here (affects Rawhide/Branched composes), also +# submit the same change to the Bodhi config (affects updates for stable releases), +# we want to keep them in sync: +# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/files/pungi_multilib.conf +# +# format: {arch|*: [packages]} +# Sorted alphabetically +multilib_whitelist = { + '*': [ + '*-static', + 'apitrace-libs', + 'compiler-rt', + 'dssi-vst-wine', + 'fakechroot-libs', + 'fakeroot-libs', + 'glib-networking', + 'glx-utils', + 'ibus-gtk2', + 'ibus-gtk3', + 'ibus-libs', + 'iptables', + 'libflashsupport', + 'libgnat', + 'lmms-vst', + 'mangohud', + 'mariadb-connector-odbc', + 'mesa-vdpau-drivers', + 'mesa-vulkan-drivers', + 'mysql-connector-odbc', + 'nosync', + 'nspluginwrapper', + 'nvidia-query-resource-opengl-lib', + 'p11-kit-trust', + 'pam', + 'perl-libs', + 'pipewire', + 'postgresql-odbc', + 'redhat-lsb', + 'syslinux-extlinux-nonlinux', + 'syslinux-nonlinux', + 'syslinux-tftpboot', + 'systemd-pam', + 'valgrind', + 'vkBasalt', + 'wine', + 'wine-*', + 'yaboot', + ], +}