From f331bad3da7289f98fcfa3ea1f26361597be2c6c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 5 Oct 2023 19:54:54 -0400
Subject: [PATCH] ci: Ensure composefs+openssl are is enabled on Fedora

For some reason we're not picking this up in the Prow build,
which breaks things because now rpm-ostree hard requires it.

Let's make this a fatal build time error for more clear
debugging.
---
 ci/build.sh    | 3 +++
 ci/libbuild.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ci/build.sh b/ci/build.sh
index 4860565845..18bc529aaf 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -20,6 +20,9 @@ if test "${OS_ID}" = 'fedora'; then
         *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
     esac
 fi
+if [[ "${OS_ID_LIKE}" =~ rhel|fedora ]]; then
+    CONFIGOPTS="${CONFIGOPTS:-} --with-composefs --with-openssl"
+fi
 case "${CONFIGOPTS:-}" in
     *--with-curl*|--with-soup*)
         if test -x /usr/bin/gnome-desktop-testing-runner; then
diff --git a/ci/libbuild.sh b/ci/libbuild.sh
index 9938e282fa..d4d431415b 100644
--- a/ci/libbuild.sh
+++ b/ci/libbuild.sh
@@ -3,6 +3,7 @@
 dn=$(cd $(dirname $0) && pwd)
 
 OS_ID=$(. /etc/os-release; echo $ID)
+OS_ID_LIKE=$(. /etc/os-release; echo $OS_ID $ID_LIKE)
 OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
 
 pkg_upgrade() {