Split general.conf to general.conf and multilib.conf
Move multilib configuration to separate file. So we can keep it in sync with Bodhi pungi config. Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný
kevin
parent
82cd5db7fe
commit
76ff6194d6
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
76
general.conf
76
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 = []
|
||||
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
],
|
||||
}
|
||||
Loading…
Reference in New Issue