Skip to content

Commit 8ef2ae9

Browse files
committed
provision-derived: Temporarily install ostree 2026.1 for bootconfig-extra
The loader-entries set-options-for-source feature requires ostree >= 2026.1 for the bootconfig-extra serialization that preserves x-options-source-* BLS keys through staged deployment roundtrips. ostree 2026.1 is not yet in the stable repos for any of the supported platforms. This commit adds a temporary block to install it from: - CentOS Stream 9/10: direct Koji RPM URLs (c9s-candidate/c10s-candidate) - Fedora 43/44: updates-testing repo (Bodhi) The block is guarded by a version check (rpm -q ostree | grep "2026\."), so once base images ship ostree >= 2026.1, this is a no-op and can be safely removed without urgency. xref ostreedev/ostree#3570 Assisted-by: OpenCode (Claude Opus 4.6) Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
1 parent fb8c668 commit 8ef2ae9

1 file changed

Lines changed: 32 additions & 0 deletions

File tree

hack/provision-derived.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,38 @@ bootupd_nevra=$(dnf --disableplugin=subscription-manager --disablerepo=* --enabl
126126
dnf -y install ${bootupd_nevra}
127127
rm -f /etc/yum.repos.d/coreos-continuous.repo
128128

129+
# Temporary: upgrade ostree to 2026.1 for bootconfig-extra support
130+
# (required by loader-entries source tracking)
131+
# xref https://github.com/ostreedev/ostree/pull/3570
132+
# TODO: Remove this block once all base images ship ostree >= 2026.1
133+
if ! rpm -q ostree 2>/dev/null | grep -q "2026\." ; then
134+
arch=$(uname -m)
135+
case "${ID}-${VERSION_ID}" in
136+
"centos-9")
137+
koji_base="https://kojihub.stream.centos.org/kojifiles/packages/ostree/2026.1/1.el9/${arch}"
138+
dnf -y install \
139+
"${koji_base}/ostree-2026.1-1.el9.${arch}.rpm" \
140+
"${koji_base}/ostree-libs-2026.1-1.el9.${arch}.rpm"
141+
if rpm -q ostree-grub2 &>/dev/null; then
142+
dnf -y install "${koji_base}/ostree-grub2-2026.1-1.el9.${arch}.rpm"
143+
fi
144+
;;
145+
"centos-10")
146+
koji_base="https://kojihub.stream.centos.org/kojifiles/vol/koji02/packages/ostree/2026.1/1.el10/${arch}"
147+
dnf -y install \
148+
"${koji_base}/ostree-2026.1-1.el10.${arch}.rpm" \
149+
"${koji_base}/ostree-libs-2026.1-1.el10.${arch}.rpm"
150+
if rpm -q ostree-grub2 &>/dev/null; then
151+
dnf -y install "${koji_base}/ostree-grub2-2026.1-1.el10.${arch}.rpm"
152+
fi
153+
;;
154+
"fedora-"*)
155+
dnf -y --enablerepo=updates-testing install \
156+
ostree-2026.1 ostree-libs-2026.1
157+
;;
158+
esac
159+
fi
160+
129161
dnf clean all
130162
# Stock extra cleaning of logs and caches in general (mostly dnf)
131163
rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf

0 commit comments

Comments
 (0)