Skip to content

Commit

Permalink
Add dnf5 on Fedora 41+
Browse files Browse the repository at this point in the history
As per coreos/fedora-coreos-tracker#1687,
we will for now add `dnf5` to the rawhide stream to test it out and
re-evaluate at branching.

It's not the default yet in f41, so doesn't own the `dnf` executable
name. Manually add a symlink to make playing with it more natural.
  • Loading branch information
jlebon committed Mar 24, 2024
1 parent 2ceb9e2 commit cfe5af5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
3 changes: 3 additions & 0 deletions manifests/exclude-dnf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exclude-packages:
- dnf
- dnf5
8 changes: 7 additions & 1 deletion manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ conditional-include:
- if: releasever >= 41
# Include makedumpfile subpackage from kexec-tools (new in F41+)
include: makedumpfile.yaml
# On <41, we want to keep making sure dnf doesn't slip in somehow
# On 41+, we do want it
# https://github.com/coreos/fedora-coreos-tracker/issues/1687
- if: releasever < 41
include: exclude-dnf.yaml
- if: releasever >= 41
include: include-dnf.yaml

ostree-layers:
- overlay/15fcos
Expand Down Expand Up @@ -163,7 +170,6 @@ exclude-packages:
- perl
- perl-interpreter
- nodejs
- dnf
- grubby
- cowsay # Just in case
# Let's make sure initscripts doesn't get pulled back in
Expand Down
13 changes: 13 additions & 0 deletions manifests/include-dnf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
packages:
- dnf5

# until dnf5 becomes the default, manually symlink to dnf5
postprocess:
- |
#!/usr/bin/bash
set -euo pipefail
if command -v dnf; then
echo 'dnf5 is now the default, remove this postprocess script!' >&2
exit 1
fi
ln -s dnf5 /usr/bin/dnf

0 comments on commit cfe5af5

Please sign in to comment.