From: Colin Walters <walters@verbum.org>
Date: Thu, 5 Oct 2023 23:54:54 +0000 (-0400)
Subject: ci: Ensure composefs+openssl are is enabled on Fedora
X-Git-Tag: archive/raspbian/2023.7-3+rpi1^2~16^2^2~11^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f76b03089f521ac52f70b7b54379761c033fbb8;p=ostree.git

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.
---

diff --git a/ci/build.sh b/ci/build.sh
index 48605658..18bc529a 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 9938e282..76bdf096 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 $ID ${ID_LIKE:-})
 OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
 
 pkg_upgrade() {