Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jul 14, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading