shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-11 20:58:45 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Colin Walters 2023-07-14 10:34:46 -04:00
parent 3d29f89c0e
commit 592351d1b0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View File

@ -196,7 +196,7 @@ jobs:
extra-packages: >- extra-packages: >-
libssl-dev libssl-dev
configure-options: >- configure-options: >-
--with-composefs --with-crypto=openssl --with-crypto=openssl
# A build using libsoup3. After bookworm is released, this can # A build using libsoup3. After bookworm is released, this can
# be switched to Debian Stable. # be switched to Debian Stable.

2
ci/prow/Dockerfile
View File

@ -1,7 +1,7 @@
FROM registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel as builder FROM registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel as builder
WORKDIR /src WORKDIR /src
COPY . . 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
RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests
# Uncomment this to fake a build to test the code below # Uncomment this to fake a build to test the code below

2
configure.ac
View File

@ -294,7 +294,7 @@ AC_COMPILE_IFELSE(
AC_ARG_WITH(composefs, AC_ARG_WITH(composefs,
AS_HELP_STRING([--with-composefs], [Support 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"; if test x$with_composefs != xno; then OSTREE_FEATURES="$OSTREE_FEATURES composefs";
AC_DEFINE([HAVE_COMPOSEFS], 1, [Define if we have libcomposefs]) AC_DEFINE([HAVE_COMPOSEFS], 1, [Define if we have libcomposefs])