From d86b00a508ac64bc1c712ae3b0827c7aefc6775d Mon Sep 17 00:00:00 2001 From: bms8197 Date: Wed, 20 Dec 2023 12:40:27 +0200 Subject: [PATCH] committing changes in /etc made by "-bash" Package changes: --- .etckeeper | 2 -- mock/templates/fedora-eln.tpl | 2 ++ mock/templates/fedora-rawhide.tpl | 10 +++++++++- mock/templates/openmandriva-cooker.tpl | 1 + mock/templates/openmandriva-rolling.tpl | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.etckeeper b/.etckeeper index 43e06a1..509a703 100755 --- a/.etckeeper +++ b/.etckeeper @@ -4973,8 +4973,6 @@ maybe chmod 0640 'nginx/conf.d/mully.go.ro.conf' maybe chown 'nginx' 'nginx/conf.d/padmin.club3d.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/padmin.club3d.ro.conf' maybe chmod 0640 'nginx/conf.d/padmin.club3d.ro.conf' -maybe chown 'nginx' 'nginx/conf.d/php-fpm.conf' -maybe chgrp 'nginx' 'nginx/conf.d/php-fpm.conf' maybe chmod 0644 'nginx/conf.d/php-fpm.conf' maybe chown 'nginx' 'nginx/conf.d/rspamd.club3d.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/rspamd.club3d.ro.conf' diff --git a/mock/templates/fedora-eln.tpl b/mock/templates/fedora-eln.tpl index 23ca3c0..a9fca33 100644 --- a/mock/templates/fedora-eln.tpl +++ b/mock/templates/fedora-eln.tpl @@ -17,6 +17,8 @@ config_opts['package_manager'] = 'dnf' # Per https://github.com/fedora-eln/eln/issues/164 updated up to 4 times a day. # Docs: https://docs.fedoraproject.org/en-US/eln/deliverables/#_container_image config_opts['bootstrap_image'] = 'quay.io/fedoraci/fedora:eln' +# Per https://github.com/fedora-eln/eln/issues/166 +config_opts['bootstrap_image_ready'] = True config_opts['dnf.conf'] = """ [main] diff --git a/mock/templates/fedora-rawhide.tpl b/mock/templates/fedora-rawhide.tpl index cb1a423..b6796e1 100644 --- a/mock/templates/fedora-rawhide.tpl +++ b/mock/templates/fedora-rawhide.tpl @@ -8,8 +8,16 @@ config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif % config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '40' -config_opts['package_manager'] = 'dnf' + +# https://fedoraproject.org/wiki/Changes/BuildWithDNF5 +config_opts['package_manager'] = 'dnf5' + config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:rawhide' + +# For F41+ there's https://fedoraproject.org/wiki/Changes/ReplaceDnfWithDnf5 so +# once done, re-revert https://pagure.io/fedora-kickstarts/c/f7bf98d3af6d655c6d64ba9c8d2f88cbffbbb06d?branch=main +#config_opts['bootstrap_image_ready'] = True + config_opts['description'] = 'Fedora Rawhide' config_opts['dnf.conf'] = """ diff --git a/mock/templates/openmandriva-cooker.tpl b/mock/templates/openmandriva-cooker.tpl index 77d8c9d..faaee23 100644 --- a/mock/templates/openmandriva-cooker.tpl +++ b/mock/templates/openmandriva-cooker.tpl @@ -4,6 +4,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '5.0' config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds config_opts['package_manager'] = 'dnf' +config_opts['dnf_install_command'] = 'install python-dnf python-dnf-plugins-core' config_opts['description'] = 'OpenMandriva Cooker {{ releasever }}' config_opts['bootstrap_image'] = 'docker.io/openmandriva/cooker:latest' diff --git a/mock/templates/openmandriva-rolling.tpl b/mock/templates/openmandriva-rolling.tpl index 5783c6d..2d110e9 100644 --- a/mock/templates/openmandriva-rolling.tpl +++ b/mock/templates/openmandriva-rolling.tpl @@ -4,6 +4,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '5.0' config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds config_opts['package_manager'] = 'dnf' +config_opts['dnf_install_command'] = 'install python-dnf python-dnf-plugins-core' config_opts['description'] = 'OpenMandriva Rolling' # Is there a corresponding rolling image? #1171