Skip to content

Commit

Permalink
configs: Fedora 41+ configuration images are "dnf5 ready"
Browse files Browse the repository at this point in the history
The latest Rawhide images already have dnf5-plugins package:
https://pagure.io/fedora-kiwi-descriptions/pull-request/63

This means we can use them "as is", without installing additional stuff
into the prepared bootstrap chroot (speed the build up).
  • Loading branch information
praiskup committed Jul 2, 2024
1 parent 3a382bd commit a3ddad4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/templates/fedora-branched.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['package_manager'] = '{% if releasever|int >= 40 %}dnf5{% else %}dnf{% endif %}'

config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:{{ releasever }}'
config_opts['bootstrap_image_ready'] = int(config_opts['releasever']) >= 41

config_opts['dnf.conf'] = """
[main]
Expand Down
5 changes: 1 addition & 4 deletions mock-core-configs/etc/mock/templates/fedora-rawhide.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ config_opts['releasever'] = '41'
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['bootstrap_image_ready'] = True

config_opts['description'] = 'Fedora Rawhide'

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The Fedora Rawhide configuration (F41+) has been fixed to use the
`bootstrap_image_ready = True` configuration because the default container
images are [already shipped with the `dnf5-plugins` package](https://pagure.io/fedora-kiwi-descriptions/pull-request/63).

0 comments on commit a3ddad4

Please sign in to comment.