Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dnf5 on Fedora 41+ #2915

Merged
merged 1 commit into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
jlebon marked this conversation as resolved.
Show resolved Hide resolved

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 dnf to it
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
Loading