Merge branch 'dnf5-conditional' into 'main'

Move python3-libdnf to fedora only

See merge request fedora/bootc/base-images!172
This commit is contained in:
Jonathan Lebon 2025-06-17 18:23:09 +00:00
commit a750416a16
3 changed files with 17 additions and 2 deletions

View file

@ -1,3 +1,7 @@
include:
- fedora-includes/generic.yaml
- standard/manifest.yaml
packages:
# Make Ansible "package" builtin work by default
- python3-libdnf5

View file

@ -42,8 +42,6 @@ packages:
- zram-generator
# This one is in Python so isn't in FCOS, but we can safely add it here.
- sos
# Make Ansible "package" builtin work by default
- python3-libdnf5
# Make Ansible "package_facts" builtin work by default
- python3-rpm

13
tests/rootfs/cases/fedora-only Executable file
View file

@ -0,0 +1,13 @@
#!/bin/bash
set -xeuo pipefail
. /usr/lib/os-release
case "${ID}" in
fedora)
# https://gitlab.com/fedora/bootc/base-images/-/merge_requests/172
if rpm -q python3 &>/dev/null; then
rpm -q python3-libdnf5
fi
;;
*)
;;
esac