Revert replacing DNF with DNF5

The switch to DNF 5 has been postponed, likely to Fedora 41. See
https://pagure.io/fesco/issue/3039.

This reverts the following commits:
41a8487712
d84d3e61e0
b24aea7e68
02439d3a30
This commit is contained in:
Evan Goode 2023-08-07 17:32:41 +00:00
parent fe345ff841
commit f7bf98d3af
8 changed files with 22 additions and 15 deletions

View File

@ -22,6 +22,12 @@ rootpw vagrant
bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
%packages %packages
# The default koji Vagrantfile configuration uses rsync to sync files between
# the vagrant host and the guest. It uses yum to verify that rsync is present
# and/or install it if it is not. It will fail without adding the yum compat
# layer for dnf
# TODO: Teach vagrant about dnf
dnf-yum
# rsync gets installed when the Vagrant box is first launched on the # rsync gets installed when the Vagrant box is first launched on the
# users setup. This can actually take a bit of time. Just fold it # users setup. This can actually take a bit of time. Just fold it
# in to the base box disk image # in to the base box disk image

View File

@ -1,12 +1,11 @@
# See fedora-container-common.ks for details on how to hack on container image kickstarts # See fedora-container-common.ks for details on how to hack on container image kickstarts
# This base is a stripped back Fedora image without python3. # This base is a stripped back Fedora image without python3/dnf.
# If you need that use the standard base image. # If you need that use the standard base image.
%include fedora-container-common.ks %include fedora-container-common.ks
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
# DNF 5 replaces microdnf in Fedora 39+. microdnf
dnf5
%end %end

View File

@ -1,5 +1,5 @@
# See fedora-container-common.ks for details on how to hack on container image kickstarts # See fedora-container-common.ks for details on how to hack on container image kickstarts
# This base is a standard Fedora image with python3 and dnf5 # This base is a standard Fedora image with python3 and dnf
%include fedora-container-common.ks %include fedora-container-common.ks
@ -7,8 +7,8 @@
rootfiles rootfiles
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf5 dnf
dnf5-plugins dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
sudo sudo
-glibc-langpack-en -glibc-langpack-en
-langpacks-en -langpacks-en

View File

@ -1,7 +1,7 @@
# Kickstart file for Fedora Toolbox # Kickstart file for Fedora Toolbox
# See fedora-container-common.ks for details on how to hack on container image kickstarts # See fedora-container-common.ks for details on how to hack on container image kickstarts
# This base is a standard Fedora image with python3 and dnf5 # This base is a standard Fedora image with python3 and dnf
%include fedora-container-common.ks %include fedora-container-common.ks
@ -15,8 +15,9 @@ bzip2
coreutils-common coreutils-common
curl curl
diffutils diffutils
dnf5 dnf
dnf5-plugins dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
dnf-plugins-core
findutils findutils
flatpak-spawn flatpak-spawn
fpaste fpaste

View File

@ -1,5 +1,5 @@
# See fedora-container-common.ks for details on how to hack on container image kickstarts # See fedora-container-common.ks for details on how to hack on container image kickstarts
# This base is a standard Fedora-ELN image with python3 and dnf5 # This base is a standard Fedora-ELN image with python3 and dnf
%include fedora-container-common.ks %include fedora-container-common.ks
@ -10,7 +10,8 @@ fedora-repos-eln
rootfiles rootfiles
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf5 dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
sudo sudo
-glibc-langpack-en -glibc-langpack-en
-langpacks-en -langpacks-en

View File

@ -32,11 +32,11 @@ reboot
# Packages # Packages
%packages %packages
@core @core
dnf5 dnf
kernel kernel
yum yum
nfs-utils nfs-utils
dnf5-plugins dnf-utils
# pull firmware packages out # pull firmware packages out
-aic94xx-firmware -aic94xx-firmware

View File

@ -1,5 +1,5 @@
%packages %packages
dnf5 microdnf
-@standard -@standard
-initial-setup-gui -initial-setup-gui
-generic-release* -generic-release*

View File

@ -31,7 +31,7 @@ coreutils-single
util-linux util-linux
rpm rpm
shadow-utils shadow-utils
dnf5 microdnf
glibc-minimal-langpack glibc-minimal-langpack
grubby grubby
kernel kernel