build-sys: Enable composefs at *build time* by default

There's no additional dependencies, and it's a small amount
of new code.

The riskiest thing is the changes to ostree-prepare-root, but
I believe that things are in a good state now there.

Again, this just enables it at *build time* - it's still
off at runtime by default.

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dfc4eedc15903f2b9588dcd64954bb33133df183..65295c9bb3ad11bf9ab2f387944588842d9798fa 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -196,7 +196,7 @@ jobs:
             extra-packages: >-
               libssl-dev
             configure-options: >-
-              --with-composefs --with-crypto=openssl
+              --with-crypto=openssl
 
           # A build using libsoup3. After bookworm is released, this can
           # be switched to Debian Stable.

diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile
index b72d4719f017c43c9952d82c6095427aba590a21..32215ca0e63d9d437e98a383f1fc5d3d469a7a56 100644 (file)
--- a/ci/prow/Dockerfile
+++ b/ci/prow/Dockerfile
@@ -1,7 +1,7 @@
 FROM registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel as builder
 WORKDIR /src
 COPY . .
-RUN env CONFIGOPTS=--with-composefs ./ci/build.sh && make install DESTDIR=/cosa/component-install
+RUN env ./ci/build.sh && make install DESTDIR=/cosa/component-install
 RUN make -C tests/kolainst
 RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests
 # Uncomment this to fake a build to test the code below

diff --git a/configure.ac b/configure.ac
index 02164858bf2b2077c24aaa93114237e51c92fba9..0e45aa8762cbcfebdbee7d2d9a387cf026a6258f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -294,7 +294,7 @@ AC_COMPILE_IFELSE(
 
 AC_ARG_WITH(composefs,
            AS_HELP_STRING([--with-composefs], [Support composefs]),
-           :, with_composefs=no)
+           :, with_composefs=yes)
 
 if test x$with_composefs != xno; then OSTREE_FEATURES="$OSTREE_FEATURES composefs";
    AC_DEFINE([HAVE_COMPOSEFS], 1, [Define if we have libcomposefs])