From b16f4f3c55b93634306a4f7114951d7e8724db89 Mon Sep 17 00:00:00 2001
From: Rolv Apneseth <rolv.apneseth@gmail.com>
Date: Sat, 17 Oct 2026 14:03:17 +0100
Subject: [PATCH] ci: download the grub-cc binary from Fedora Koji to avoid
 failures

See [1] and the referenced bootc issue at [2]. This change follows the
same pattern as the fix there [3].

[1]: https://github.com/coreos/bootupd/issues/1173
[2]: https://github.com/bootc-dev/bootc/issues/2572
[3]: https://github.com/bootc-dev/bootc/pull/2575
---
 Dockerfile.bls | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/Dockerfile.bls b/Dockerfile.bls
index a1693562..2284acff 100644
--- a/Dockerfile.bls
+++ b/Dockerfile.bls
@@ -19,34 +19,10 @@ RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/rooth
     make && make install-all DESTDIR=/out
 
 
-# Get the latest GrubCC binary
-FROM quay.io/fedora/eln:latest AS grub-cc-download
-RUN --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp <<EOF
-set -eux
-
-# There isn't a generic grub2-efi-cc package that DNF can automatically resolve
-case "$(uname -m)" in
-    x86_64)
-        dnf download grub2-efi-x64-cc
-        ;;
-    aarch64)
-        dnf download grub2-efi-aa64-cc
-        ;;
-    *)
-        echo "Unsupported architecture: $(uname -m)" >&2
-        exit 1
-        ;;
-esac
-
-mv ./*.rpm grub-cc.rpm
-
-EOF
-
 FROM $base
 # Clean out the default to ensure we're using our updated content
 RUN rpm -e bootupd
 COPY --from=build /out/ /
-COPY --from=grub-cc-download /grub-cc.rpm /var/grub-cc.rpm
 # Install bootc from copr
 RUN --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp <<EORUN
 set -xeuo pipefail
@@ -91,6 +67,24 @@ cleanup() {
     rm -rvf /var/grub-cc*
 }
 
+# HACK: fetch grub-cc from Fedora Koji since there is currently no reliable source for grub-cc.
+# NOTE: the referenced build may eventually be garbage collected.
+case "$(uname -m)" in
+    x86_64)
+        grub_cc_url=https://kojipkgs.fedoraproject.org/packages/grub2/2.12/60.eln156/x86_64/grub2-efi-x64-cc-2.12-60.eln156.x86_64.rpm
+        ;;
+    aarch64)
+        grub_cc_url=https://kojipkgs.fedoraproject.org/packages/grub2/2.12/60.eln156/aarch64/grub2-efi-aa64-cc-2.12-60.eln156.aarch64.rpm
+        ;;
+    *)
+        echo "Unsupported architecture: $(uname -m)" >&2
+        exit 1
+        ;;
+esac
+
+curl --fail --location --retry 5 --retry-all-errors --retry-delay 1 \
+    --output /var/grub-cc.rpm "$grub_cc_url"
+
 # Extract and install grub-cc at the correct path
 mkdir /var/grub-cc
 rpm2archive /var/grub-cc.rpm | tar -xvz -C /var/grub-cc