| |
@@ -1,10 +1,12 @@
|
| |
+ # Import shared settings from pungi_general.conf
|
| |
+ from pungi_general import *
|
| |
+ # Import multilib settings from pungi_multilib.conf
|
| |
+ from pungi_multilib import *
|
| |
+
|
| |
# PRODUCT INFO
|
| |
skip_phases = ["buildinstall", "extra_files"]
|
| |
- release_name = '[[ release.id_prefix.title() ]]'
|
| |
- release_short = '[[ release.id_prefix.title() ]]'
|
| |
release_version = '[[ release.version_int ]]'
|
| |
release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
|
| |
- release_is_layered = False
|
| |
old_composes_per_release_type = True
|
| |
|
| |
# GENERAL SETTINGS
|
| |
@@ -58,7 +60,6 @@
|
| |
None
|
| |
{% endif %}
|
| |
]
|
| |
- hashed_directories = True
|
| |
comps_filter_environments = False
|
| |
|
| |
# RUNROOT settings
|
| |
@@ -67,22 +68,17 @@
|
| |
runroot_tag = 'f[[ release.version_int ]]-build'
|
| |
|
| |
# PKGSET
|
| |
- pkgset_source = 'koji' # koji, repos
|
| |
pkgset_koji_tag = '[[ id ]]'
|
| |
pkgset_koji_inherit = False
|
| |
pkgset_allow_reuse = False
|
| |
- filter_system_release_packages = False
|
| |
|
| |
# GATHER
|
| |
gather_method = 'deps'
|
| |
gather_backend = 'dnf'
|
| |
check_deps = False
|
| |
- greedy_method = 'build'
|
| |
repoclosure_backend = 'dnf'
|
| |
|
| |
# CREATEREPO
|
| |
- createrepo_c = True
|
| |
- createrepo_checksum = 'sha256'
|
| |
createrepo_deltas = [
|
| |
('^Everything$', {'*': True})
|
| |
]
|
| |
@@ -119,90 +115,6 @@
|
| |
]
|
| |
filter_packages = []
|
| |
|
| |
- # Note: If you change something here (affects updates for stable releases), also
|
| |
- # submit the same change to pungi-fedora (affects Rawhide/Branched composes),
|
| |
- # we want to keep them in sync:
|
| |
- # https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
|
| |
- #
|
| |
- # format: {arch|*: [packages]}
|
| |
- multilib_blacklist = {
|
| |
- '*': [
|
| |
- 'dmraid-devel',
|
| |
- 'ghc-*',
|
| |
- 'httpd-core',
|
| |
- 'httpd-devel',
|
| |
- 'java-1.5.0-gcj-devel',
|
| |
- 'java-1.6.0-openjdk-devel',
|
| |
- 'java-1.7.0-icedtea-devel',
|
| |
- 'java-1.7.0-openjdk-devel',
|
| |
- 'java-1.8.0-openjdk-devel',
|
| |
- '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 updates for stable releases), also
|
| |
- # submit the same change to pungi-fedora (affects Rawhide/Branched composes),
|
| |
- # we want to keep them in sync:
|
| |
- # https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
|
| |
- #
|
| |
- # format: {arch|*: [packages]}
|
| |
- 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',
|
| |
- 'libomp',
|
| |
- 'lmms-vst',
|
| |
- 'mangohud',
|
| |
- 'mariadb-connector-odbc',
|
| |
- 'mesa-dri-drivers',
|
| |
- 'mesa-va-drivers',
|
| |
- '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',
|
| |
- ],
|
| |
- }
|
| |
-
|
| |
createiso_skip = [
|
| |
('^Everything$', {
|
| |
'*': True,
|
| |
zlopez
commented 2 years ago
The Bodhi update containing https://github.com/fedora-infra/bodhi/pull/5154 should be already in place. So let's try this again and close https://pagure.io/fedora-infrastructure/issue/10779.