Skip to content

Commit

Permalink
Merge pull request #2934 from cgwalters/enable-composefs-default
Browse files Browse the repository at this point in the history
build-sys: Enable composefs at *build time* by default
  • Loading branch information
ericcurtin authored Jul 14, 2023
2 parents 3d29f89 + 592351d commit 18d6f59
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ci/prow/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down

0 comments on commit 18d6f59

Please sign in to comment.