From bbdb209ecdea0e1d9d13748c8512cd24976aaf32 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 21 Mar 2024 16:40:36 -0400 Subject: [PATCH] Add `dnf5` on Fedora 41+ As per https://github.com/coreos/fedora-coreos-tracker/issues/1687, we will for now add `dnf5` to the rawhide stream to test it out and re-evaluate at branching. --- manifests/exclude-dnf.yaml | 3 +++ manifests/fedora-coreos.yaml | 8 +++++++- manifests/include-dnf.yaml | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 manifests/exclude-dnf.yaml create mode 100644 manifests/include-dnf.yaml diff --git a/manifests/exclude-dnf.yaml b/manifests/exclude-dnf.yaml new file mode 100644 index 0000000000..dc51914b9f --- /dev/null +++ b/manifests/exclude-dnf.yaml @@ -0,0 +1,3 @@ +exclude-packages: + - dnf + - dnf5 diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index a7dd32e03d..ada7419b8a 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -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 @@ -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 diff --git a/manifests/include-dnf.yaml b/manifests/include-dnf.yaml new file mode 100644 index 0000000000..2c023b112d --- /dev/null +++ b/manifests/include-dnf.yaml @@ -0,0 +1,2 @@ +packages: + - dnf5