diff options
| author |  Adam Williamson <awilliam@redhat.com>
| 2024-04-25 14:19:35 -0700 |
|---|---|---|
| committer |  adamwill <adamwill@fedoraproject.org>
| 2024-05-09 06:10:06 +0000 |
| commit | 678ee6243cb73f0f668d123ac904643d2c02b39d (patch) | |
| tree | 86c3913ff8a5c3043e43004fa32f5f025aeb8cbc /teams | |
| parent | 9e7435cee58527788febd8aa07a9dad943f24296 (diff) | |
| download | kiwi-descriptions-678ee6243cb73f0f668d123ac904643d2c02b39d.tar.gz kiwi-descriptions-678ee6243cb73f0f668d123ac904643d2c02b39d.zip | |
Adjust configs for SwitchToDnf5 Change
dnf5 (in obsoleting-dnf mode) provides /usr/bin/yum and obsoletes
yum, so we should drop the 'dnf-yum' entries (which installed
yum). dnf5 also appears to provide and obsolete microdnf, so we
should replace microdnf with dnf5 in the minimal image, I guess.
dnf5-plugins seems the logical replacement for dnf-plugins-core
(which is not removed yet, but is specific to dnf4).
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Diffstat (limited to 'teams')
| -rw-r--r-- | teams/cloud/container.xml | 10 | ||||
| -rw-r--r-- | teams/cloud/vagrant.xml | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 0b8e1e8..130b1b2 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -130,7 +130,7 @@ <ignore name="glibc-langpack-en"/> <ignore name="langpacks-en"/> <ignore name="tzdata"/> - <package name="microdnf"/> + <package name="dnf5"/> <package name="glibc-minimal-langpack"/> </packages> <packages type="bootstrap" profiles="Container-Base-Generic"> @@ -142,8 +142,7 @@ <package name="rootfiles"/> <package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 --> <package name="vim-minimal"/> - <package name="dnf"/> - <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> + <package name="dnf5"/> <package name="glibc-minimal-langpack"/> <package name="tzdata"/> <package name="xz"/> @@ -178,9 +177,8 @@ <package name="curl"/> <package name="default-editor"/> <package name="diffutils"/> - <package name="dnf"/> - <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> - <package name="dnf-plugins-core"/> + <package name="dnf5"/> + <package name="dnf5-plugins"/> <package name="fedora-release-toolbx"/> <package name="file"/> <package name="findutils"/> diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml index ebccf93..624f4ef 100644 --- a/teams/cloud/vagrant.xml +++ b/teams/cloud/vagrant.xml @@ -58,7 +58,6 @@ <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/> </users> <packages type="image" patternType="plusRecommended" profiles="VagrantCore"> - <package name="dnf-yum"/> <package name="rsync"/> <package name="fuse-sshfs"/> <package name="gdisk"/> |