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

buildroot-prep: fixups to get it to work for rawhide

Browse Source 
In rawhide $releasever evaluates to `rawhide` but we need it to
be `44`. Let's use the VERSION_ID here.

Also install `patch` if we need to patch. This passed in CI on
5040a32 because I guess the 42 bootc image had been built in
the past day.

Fixes 5040a32
This commit is contained in:
Dusty Mabe
2025-08-28 19:53:21 -04:00
parent 5040a32445
commit 28e639f858
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildroot-prep
View File

@@ -11,11 +11,12 @@ arch=$(uname -m)
# 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. # Comment this out if not used to not unnecessarily pay for repo metadata.
cp /run/src/fedora-coreos-continuous.repo /etc/yum.repos.d cp /run/src/fedora-coreos-continuous.repo /etc/yum.repos.d
sudo dnf update rpm-ostree -y --repo fedora-coreos-continuous sudo dnf update rpm-ostree -y --repo fedora-coreos-continuous --releasever "$VERSION_ID"
# fast-track https://gitlab.com/fedora/bootc/base-images/-/merge_requests/279 # fast-track https://gitlab.com/fedora/bootc/base-images/-/merge_requests/279
help=$(/usr/libexec/bootc-base-imagectl build-rootfs -h) help=$(/usr/libexec/bootc-base-imagectl build-rootfs -h)
if ! grep -q -- --lock <<< "$help"; then if ! grep -q -- --lock <<< "$help"; then
echo "Patching bootc-base-imagectl" echo "Patching bootc-base-imagectl"
sudo dnf install -y patch
curl -L https://gitlab.com/fedora/bootc/base-images/-/commit/35467bdbdcc01a8ad6b42c33c935ffe5c8c74395.patch | patch -p1 -d /usr/libexec curl -L https://gitlab.com/fedora/bootc/base-images/-/commit/35467bdbdcc01a8ad6b42c33c935ffe5c8c74395.patch | patch -p1 -d /usr/libexec
fi fi