From 58570a1e60be25ed41578baa930f3a98241042df Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 8 May 2025 08:52:21 -0400 Subject: [PATCH] Move python3-libdnf5 to fedora only ref https://gitlab.com/redhat/centos-stream/containers/bootc/-/merge_requests/558#note_2492110138 Signed-off-by: Colin Walters --- fedora-standard.yaml | 4 ++++ standard/manifest.yaml | 2 -- tests/rootfs/cases/fedora-only | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 tests/rootfs/cases/fedora-only diff --git a/fedora-standard.yaml b/fedora-standard.yaml index 73eeb5d..4dd7d72 100644 --- a/fedora-standard.yaml +++ b/fedora-standard.yaml @@ -1,3 +1,7 @@ include: - fedora-includes/generic.yaml - standard/manifest.yaml + +packages: + # Make Ansible "package" builtin work by default + - python3-libdnf5 diff --git a/standard/manifest.yaml b/standard/manifest.yaml index 2016cc2..001235c 100644 --- a/standard/manifest.yaml +++ b/standard/manifest.yaml @@ -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 diff --git a/tests/rootfs/cases/fedora-only b/tests/rootfs/cases/fedora-only new file mode 100755 index 0000000..ab736c5 --- /dev/null +++ b/tests/rootfs/cases/fedora-only @@ -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