From 64d15c0687748726624a283de51ddf5e326dfcfb Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Tue, 30 Sep 2025 16:22:39 -0500
Subject: [PATCH 1/2] Added buildhost ready flag file for bootstrapping new
 distributions or architectures

In this case there is no rhel-9-arm cfengine build available so use a pre-setup image with /etc/cfengine-buildhost-ready.flag file present.

This flag file will cause the setup-cfengine-build-host.sh script to be skipped.

Ticket: ENT-13016
Changelog: none
---
 ci/setup-cfengine-build-host.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ci/setup-cfengine-build-host.sh b/ci/setup-cfengine-build-host.sh
index b32ed6248..9fd35e4bf 100755
--- a/ci/setup-cfengine-build-host.sh
+++ b/ci/setup-cfengine-build-host.sh
@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 shopt -s expand_aliases
 
+ready_flag=/etc/cfengine-buildhost-ready.flag
+if [ -f "$ready_flag" ]; then
+  echo "Found $ready_flag file so skipping build host setup script and policy."
+  exit 0
+fi
+
 # Use the newest CFEngine version we can
 CFE_VERSION=3.26.0
 if [ -f /etc/centos-release ]; then

From dce653846281192c4667352b7b700e67a670d1c1 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Sat, 4 Oct 2025 11:10:29 -0500
Subject: [PATCH 2/2] Added patch package to build host config for redhat_10

Ticket: ENT-13016
Changelog: none
---
 ci/cfengine-build-host-setup.cf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf
index 7cac09e72..366f20255 100644
--- a/ci/cfengine-build-host-setup.cf
+++ b/ci/cfengine-build-host-setup.cf
@@ -143,6 +143,9 @@ bundle agent cfengine_build_host_setup
     (redhat_9).(yum_dnf_conf_ok)::
       "perl-Sys-Hostname" comment => "Needed by __04_examples_outputs_check_outputs_cf";
 
+    (redhat_10).(yum_dnf_conf_ok)::
+      "patch";
+
     suse|opensuse|sles::
       "binutils";
       "gdb";