coreos/fedora-coreos-config
1
0
Fork 0
mirror of https://github.com/coreos/fedora-coreos-config.git synced 2026-02-05 18:45:44 +01:00
Code Issues Releases Activity

buildroot-prep: various enhancements

Browse Source 
Add a description of what this script is at the top-level.

Switch to using the continuous repo for fast-tracking the rpm-ostree
backport.

Also backport
35467bdbdc
since it seems like fedora-bootc container images have not been respun
as quickly as we thought they'd be.
This commit is contained in:
Jonathan Lebon
2025-08-28 17:23:18 -04:00
committed by Dusty Mabe
parent 44e8d07920
commit 5040a32445
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
buildroot-prep
View File

@@ -1,17 +1,21 @@
#!/bin/bash
set -euo pipefail
# This script is called in the buildah path to modify the build environment
# before entering the shared build-rootfs script. Example use cases are to
# fast-track fixes or work around bugs.
arch=$(uname -m)
. /etc/os-release
# fast-track backport of https://github.com/coreos/rpm-ostree/pull/5475
# Fast-track backport of https://github.com/coreos/rpm-ostree/pull/5475.
# Comment this out if not used to not unnecessarily pay for repo metadata.
cp /run/src/fedora-coreos-continuous.repo /etc/yum.repos.d
sudo dnf update rpm-ostree -y --repo fedora-coreos-continuous
case "$VERSION_ID" in
43) urls=(https://kojipkgs.fedoraproject.org//packages/rpm-ostree/2025.10/3.fc43/"$arch"/rpm-ostree-{,libs-}2025.10-3.fc43."$arch".rpm);;
44) urls=(https://kojipkgs.fedoraproject.org//packages/rpm-ostree/2025.10/3.fc44/"$arch"/rpm-ostree-{,libs-}2025.10-3.fc44."$arch".rpm);;
*) exit 0;;
esac
if rpm -q "rpm-ostree-2025.10-1.fc43.$arch"; then
sudo dnf install -y "${urls[@]}"
# fast-track https://gitlab.com/fedora/bootc/base-images/-/merge_requests/279
help=$(/usr/libexec/bootc-base-imagectl build-rootfs -h)
if ! grep -q -- --lock <<< "$help"; then
echo "Patching bootc-base-imagectl"
curl -L https://gitlab.com/fedora/bootc/base-images/-/commit/35467bdbdcc01a8ad6b42c33c935ffe5c8c74395.patch | patch -p1 -d /usr/libexec
fi

7
fedora-coreos-continuous.repo Normal file
View File

@@ -0,0 +1,7 @@
# This is used in the buildah path for fast-tracking build tools
[fedora-coreos-continuous]
metadata_expire=1m
baseurl=https://kojipkgs.fedoraproject.org/repos-dist/f$releasever-coreos-continuous/latest/$basearch/
gpgcheck=0
enabled=0
skip_if_unavailable=False