From fa9f15e87eb6901bd057d9af6ccefba2e3c9e768 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 9 Jun 2025 13:48:58 -0400 Subject: [PATCH 1/2] fedora-42: update repos list Fedora 42 is GA now so use GA repos. This is the legacy Pungi path, but one should be able to test the legacy paths locally too. Pungi overrides repos so it doesn't hit this. --- fedora-42.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-42.yaml b/fedora-42.yaml index 26fed96..34c6c1d 100644 --- a/fedora-42.yaml +++ b/fedora-42.yaml @@ -2,5 +2,6 @@ # will be removed in the future. releasever: 42 repos: - - fedora-devel + - fedora + - fedora-updates include: fedora-bootc.yaml From 39a631218f77f7b3a3af858a5d42413e20d6a310 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 9 Jun 2025 13:51:00 -0400 Subject: [PATCH 2/2] Install bootc-base-imagectl in Pungi path Right now, one can't use the official fedora-bootc images for the custom base image flow because it doesn't actually ship `bootc-base-imagectl`. This will be fixed by the move to Konflux, but it's not clear when that will happen. Given how trivial it is to do, let's just ship it in the image for now. Closes: https://gitlab.com/fedora/bootc/base-images/-/issues/44 --- finalize.d/01-pungi-install-manifests.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 finalize.d/01-pungi-install-manifests.sh diff --git a/finalize.d/01-pungi-install-manifests.sh b/finalize.d/01-pungi-install-manifests.sh new file mode 100755 index 0000000..8a290fe --- /dev/null +++ b/finalize.d/01-pungi-install-manifests.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -xeuo pipefail + +# This is used in the legacy Pungi path. It won't get run in the +# container-native path since install-manifests doesn't copy this script itself +# into usr/share/doc. +target_rootfs=$(pwd) +cd "$RPMOSTREE_WORKDIR" +./install-manifests "$target_rootfs"/usr/share/doc/bootc-base-imagectl/manifests +install -m 0755 -t "$target_rootfs"/usr/libexec bootc-base-imagectl