shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-25 01:34:34 +03:00
Code Issues Projects Releases Wiki Activity
80eab25f8a
ostree/configure.ac

559 lines
22 KiB
Plaintext
Raw Normal View History

Initial commit
2011-10-10 01:03:08 +04:00
AC_PREREQ([2.63])
lib: Split symbol versioning into -released and -devel So far a lot of submitted PR have added symbols into the first section. Split the file into `-released` and `-devel` to make this more obvious. To further enforce things, we hardcode a checksum of the `-released` file in `test-symbols.sh`. Only release commits should update that checksum. Did you notice I like checksums? Closes: #931 Approved by: pwithnall
2017-06-15 04:44:04 +03:00
dnl If doing a final release, remember to follow the instructions to
dnl update libostree-released.sym from libostree-devel.sym, and update the checksum
build-sys: Add "release build" flag, use for symbol versioning I was trying to do a release and move the symbols from `-devel.sym` into `-release.sym`, but it turns out that at least GNU binutils `ld` treats an empty version script as a syntax error. Fix this by adding a "release build" flag, and only include `-devel` in non-release builds. This would also make it easier to inject that flag into our `.pc` and `ostree-version.h` and `ostree --version` metadata, but I didn't do that yet. EDIT: Turns out a simpler fix is just to add an empty section. However I kept this commit since it's a useful sanity check for whether we should include `-devel.sym` in builds, and we may want to inject the metadata later. Closes: #942 Approved by: jlebon
2017-06-19 17:23:21 +03:00
dnl in test-symbols.sh, and also set is_release_build=yes below. Then make
dnl another post-release commit to bump the version, and set is_release_build=no.
libostree: add versioning macros OSTree currently provides no way to inspect the versioning information at run time, being only available at compile time through pkg-config. This is a problem for e.g. Flatpak, that needs to check whether the 'update-frequency' option is available. Checking at compile time isn't great since it's not looking for new symbols, but only if an optional feature is present. This commit, then, adds a new header that is generated at compile time, exposing OSTree's versioning information. Closes: #728 Approved by: cgwalters
2017-03-10 20:33:52 +03:00
m4_define([year_version], [2017])
build-sys: Post-release version bump Closes: #1089 Approved by: jlebon
2017-08-17 20:23:51 +03:00
m4_define([release_version], [11])
libostree: add versioning macros OSTree currently provides no way to inspect the versioning information at run time, being only available at compile time through pkg-config. This is a problem for e.g. Flatpak, that needs to check whether the 'update-frequency' option is available. Checking at compile time isn't great since it's not looking for new symbols, but only if an optional feature is present. This commit, then, adds a new header that is generated at compile time, exposing OSTree's versioning information. Closes: #728 Approved by: cgwalters
2017-03-10 20:33:52 +03:00
m4_define([package_version], [year_version.release_version])
AC_INIT([libostree], [package_version], [walters@verbum.org])
build-sys: Post-release version bump Closes: #1089 Approved by: jlebon
2017-08-17 20:23:51 +03:00
is_release_build=no
Initial commit
2011-10-10 01:03:08 +04:00
AC_CONFIG_HEADER([config.h])
tests: Port to glib-tap.mk, make `make check` run all of the tests OSTree's code for testing predates the `glib-tap.mk` making its way into GLib. Let's switch to it, as it provides a number of advantages. By far the biggest advantage is that `make check` can start to run most of the tests *in addition* to having them work installed. This commit keeps the installed tests working, but `make check` turns out to be really broken because...our TAP usage has bitrotted to say the least. Fix that all up. Do some hacks so that the tests work uninstalled as well - in particular, `glib-tap.mk` and the bits encoded into `g_test_build_filename()` assume *recursive* Automake (blah). Work around that by creating a symlink when installed to loop back.
2016-03-02 18:28:04 +03:00
AC_CONFIG_MACRO_DIR([buildutil])
Initial commit
2011-10-10 01:03:08 +04:00
AC_CONFIG_AUX_DIR([build-aux])
configure.ac: Enable option subdir-objects for automake It silences an automake warning and keep the rootdir cleaner. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-02-02 15:00:32 +03:00
AM_INIT_AUTOMAKE([1.13 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz
tests: Port to glib-tap.mk, make `make check` run all of the tests OSTree's code for testing predates the `glib-tap.mk` making its way into GLib. Let's switch to it, as it provides a number of advantages. By far the biggest advantage is that `make check` can start to run most of the tests *in addition* to having them work installed. This commit keeps the installed tests working, but `make check` turns out to be really broken because...our TAP usage has bitrotted to say the least. Fix that all up. Do some hacks so that the tests work uninstalled as well - in particular, `glib-tap.mk` and the bits encoded into `g_test_build_filename()` assume *recursive* Automake (blah). Work around that by creating a symlink when installed to loop back.
2016-03-02 18:28:04 +03:00
color-tests subdir-objects])
Initial commit
2011-10-10 01:03:08 +04:00
AM_MAINTAINER_MODE([enable])
AM_SILENT_RULES([yes])
Use AC_USE_SYSTEM_EXTENSIONS instead of #define _GNU_SOURCE It's less copy/paste, works everywhere, etc. Also fix some missing #include "config.h".
2013-07-10 21:24:15 +04:00
AC_USE_SYSTEM_EXTENSIONS
build: Use AC_SYS_LARGEFILE So we do the right thing on 32 bit.
2013-02-24 15:35:23 +04:00
AC_SYS_LARGEFILE
Initial commit
2011-10-10 01:03:08 +04:00
AC_PROG_CC
AM_PROG_CC_C_O
parse-datetime: use the module from gnulib Use the parse-datetime module from gnulib, and adapt it to not require other modules as portability is not really an issue for us. DATE can be specified in different formats, such as: "-1 week", "last monday", "1 week ago". Include the generated .c file in the repository so to not add another dependency to Bison. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-25 12:37:21 +03:00
AC_PROG_YACC
Initial commit
2011-10-10 01:03:08 +04:00
libostree: add versioning macros OSTree currently provides no way to inspect the versioning information at run time, being only available at compile time through pkg-config. This is a problem for e.g. Flatpak, that needs to check whether the 'update-frequency' option is available. Checking at compile time isn't great since it's not looking for new symbols, but only if an optional feature is present. This commit, then, adds a new header that is generated at compile time, exposing OSTree's versioning information. Closes: #728 Approved by: cgwalters
2017-03-10 20:33:52 +03:00
dnl Versioning information
AC_SUBST([YEAR_VERSION], [year_version])
AC_SUBST([RELEASE_VERSION], [release_version])
AC_SUBST([PACKAGE_VERSION], [package_version])
build: Turn off default warnings if we find -Werror specified Our CI runs use `-Werror`; there's no point to our default warning set kicking in, it just bloats the command line output. Closes: #1023 Approved by: jlebon
2017-07-20 22:37:27 +03:00
AS_IF([echo "$CFLAGS" | grep -q -E -e '-Werror($| )'], [], [
build: Import attributes.m4, detect CFLAGS at build time I want to add `-Werror=int-conversion`, but it's only available in newer GCC versions. So let's start autodetecting available compiler flags. Closes: #431 Approved by: giuseppe
2016-08-04 23:47:46 +03:00
CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
-pipe \
-Wall \
-Werror=empty-body \
-Werror=strict-prototypes \
-Werror=missing-prototypes \
-Werror=implicit-function-declaration \
"-Werror=format=2 -Werror=format-security -Werror=format-nonliteral" \
-Werror=pointer-arith -Werror=init-self \
-Werror=missing-declarations \
-Werror=return-type \
-Werror=overflow \
build: Make -Werror=int-conversion fatal This should hopefully avoid me accidentally passing NULL for an `int` file descriptor in the future. Closes: #431 Approved by: giuseppe
2016-08-04 23:58:07 +03:00
-Werror=int-conversion \
build: Add more default errors Newer gcc has `-Wincompatible-pointer-types`, hooray! Add a few others that we pass today. Closes: #618 Approved by: jlebon
2016-12-07 17:55:10 +03:00
-Werror=parenthesis \
-Werror=incompatible-pointer-types \
-Werror=misleading-indentation \
build: Import attributes.m4, detect CFLAGS at build time I want to add `-Werror=int-conversion`, but it's only available in newer GCC versions. So let's start autodetecting available compiler flags. Closes: #431 Approved by: giuseppe
2016-08-04 23:47:46 +03:00
-Werror=missing-include-dirs -Werror=aggregate-return \
ci: Enable -Werror=unused-result with -Wp,-D_FORTIFY_SOURCE=2 (Also rename the other CI contexts to be more consistent) We pass this right now. I just noticed an instance of this in bwrap, and I think we should be trying to match the RPM build baseline. Closes: #765 Approved by: jlebon
2017-03-28 20:29:38 +03:00
-Werror=unused-result \
build: Turn off default warnings if we find -Werror specified Our CI runs use `-Werror`; there's no point to our default warning set kicking in, it just bloats the command line output. Closes: #1023 Approved by: jlebon
2017-07-20 22:37:27 +03:00
])])
Switch to using explicit WARN_CFLAGS The rationale is documented well in the automake manual.
2011-11-11 15:53:44 +04:00
AC_SUBST(WARN_CFLAGS)
Add probably working commits
2011-10-14 01:11:01 +04:00
Skip gjs-based tests if ASAN is enabled Unfortunately, introspection uses dlopen(), which doesn't quite work when the DSO is compiled with ASAN but the outer executable isn't. Trying to inject LD_PRELOAD=libasan means the outer executable has to be leak free...which, yeah, I'm not going to get into running ASAN today on gjs or pygobject. So, let's skip those tests - ideally, we still run them in some other context without the sanitizers. The coverage we have from them is middling anyways. Closes: #622 Approved by: jlebon
2016-12-08 05:59:40 +03:00
AC_MSG_CHECKING([for -fsanitize=address in CFLAGS])
if echo $CFLAGS | grep -q -e -fsanitize=address; then
AC_MSG_RESULT([yes])
using_asan=yes
else
AC_MSG_RESULT([no])
fi
AM_CONDITIONAL(BUILDOPT_ASAN, [test x$using_asan = xyes])
main: Fix subcommand usage output This commit sets prgname correctly so that the "ostree subcommand --help" output prints the subcommand rather than just "ostree". This was removed in commit f0519e541f29 because it tripped the thread sanitizer, but it's being added back conditionally so most users who don't compile with -fsanitize=adress see proper help output. Closes: #1054 Approved by: cgwalters
2017-08-04 23:18:40 +03:00
AM_COND_IF([BUILDOPT_ASAN],
[AC_DEFINE([BUILDOPT_ASAN], 1, [Define if we are building with -fsanitize=address])])
AC_MSG_CHECKING([for -fsanitize=thread in CFLAGS])
if echo $CFLAGS | grep -q -e -fsanitize=thread; then
AC_MSG_RESULT([yes])
using_tsan=yes
else
AC_MSG_RESULT([no])
fi
AM_CONDITIONAL(BUILDOPT_TSAN, [test x$using_tsan = xyes])
AM_COND_IF([BUILDOPT_TSAN],
[AC_DEFINE([BUILDOPT_TSAN], 1, [Define if we are building with -fsanitize=thread])])
Skip gjs-based tests if ASAN is enabled Unfortunately, introspection uses dlopen(), which doesn't quite work when the DSO is compiled with ASAN but the outer executable isn't. Trying to inject LD_PRELOAD=libasan means the outer executable has to be leak free...which, yeah, I'm not going to get into running ASAN today on gjs or pygobject. So, let's skip those tests - ideally, we still run them in some other context without the sanitizers. The coverage we have from them is middling anyways. Closes: #622 Approved by: jlebon
2016-12-08 05:59:40 +03:00
Initial commit
2011-10-10 01:03:08 +04:00
# Initialize libtool
core: Make libostree.so an installed library This will make it easier to have multiple binaries.
2011-11-30 03:25:07 +04:00
LT_PREREQ([2.2.4])
LT_INIT([disable-static])
Initial commit
2011-10-10 01:03:08 +04:00
Add a --version argument that also outputs features And use it in the tests to skip libarchive tests when the build doesn't support it.
2013-05-02 03:15:06 +04:00
OSTREE_FEATURES=""
AC_SUBST([OSTREE_FEATURES])
tests: Port to glib-tap.mk, make `make check` run all of the tests OSTree's code for testing predates the `glib-tap.mk` making its way into GLib. Let's switch to it, as it provides a number of advantages. By far the biggest advantage is that `make check` can start to run most of the tests *in addition* to having them work installed. This commit keeps the installed tests working, but `make check` turns out to be really broken because...our TAP usage has bitrotted to say the least. Fix that all up. Do some hacks so that the tests work uninstalled as well - in particular, `glib-tap.mk` and the bits encoded into `g_test_build_filename()` assume *recursive* Automake (blah). Work around that by creating a symlink when installed to loop back.
2016-03-02 18:28:04 +03:00
GLIB_TESTS
libglnx porting: Migrate to new tempfile code In general this is even cleaner now, though it was better after I extracted a helper function for the "write tempfile with contents" bits that were shared between metadata and regular file codepaths. Closes: #369 Approved by: jlebon
2016-06-27 04:59:12 +03:00
LIBGLNX_CONFIGURE
Install tests Matching https://live.gnome.org/GnomeGoals/InstalledTests
2013-05-01 23:26:21 +04:00
build: Use glibc's xattr support instead of requiring libattr Fixes the build on Debian, and is one library less. Closes: #78
2015-04-01 10:45:20 +03:00
AC_CHECK_HEADER([sys/xattr.h],,[AC_MSG_ERROR([You must have sys/xattr.h from glibc])])
build: Check for attr/xattr.h
2012-02-20 22:59:52 +04:00
configure.ac: properly check for bison The AC_PROG_YACC already does the checking for us, so we don't need to use AC_CHECK_PROGS (which wasn't working anyway because autoconf didn't run the check thinking it was cached already from the earlier AC_PROC_YACC, so we didn't get the default ":" value) Closes: #325 Approved by: cgwalters
2016-06-07 22:08:16 +03:00
AS_IF([test "$YACC" != "bison -y"], [AC_MSG_ERROR([bison not found but required])])
build: Also add a configure check for YACC/bison So we error out more nicely if not found.
2015-12-07 18:39:37 +03:00
Initial commit
2011-10-10 01:03:08 +04:00
PKG_PROG_PKG_CONFIG
bash: Add bash completion Completes commands, options, commit checksums, ref names, remotes, and file paths. Closes: #1077 Approved by: jlebon
2017-08-12 04:17:23 +03:00
# PKG_CHECK_VAR added to pkg-config 0.28
m4_define_default(
[PKG_CHECK_VAR],
[AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])
AS_IF([test -z "$$1"], [$1=`$PKG_CONFIG --variable="$3" "$2"`])
AS_IF([test -n "$$1"], [$4], [$5])])
PKG_CHECK_VAR(BASH_COMPLETIONSDIR, [bash-completion], [completionsdir], ,
build-sys: Move bash completions to /usr/share/ by default This is in line with the "/etc is for sysadmins", "/usr is OS" model; e.g. systemd's bash completions go there. Making this change since I was looking at the required spec file changes. Closes: #1083 Approved by: mbarnes
2017-08-16 17:15:38 +03:00
BASH_COMPLETIONSDIR="${datadir}/bash-completion/completions")
bash: Add bash completion Completes commands, options, commit checksums, ref names, remotes, and file paths. Closes: #1077 Approved by: jlebon
2017-08-12 04:17:23 +03:00
AC_SUBST(BASH_COMPLETIONSDIR)
build: Error if glib isn't found This is a bit extracted from my work on ASAN. Closes: #625 Approved by: jlebon
2016-12-08 21:38:49 +03:00
AM_PATH_GLIB_2_0(,,AC_MSG_ERROR([GLib not found]))
fetcher: Add "config-flags" construct-only property A lot of effort here just to avoid touching SoupSession directly in ostree_fetcher_new(). The reason will become apparent in subsequent commits. Note this introduces generated enum/flags GTypes using glib-mkenums. I could have just made the property type as plain integer, but doing properties right will henceforth be easier now that the automake-fu is established.
2015-11-10 03:04:42 +03:00
build: Remind about bumping related versions Closes: #295 Approved by: cgwalters
2016-05-13 08:59:10 +03:00
dnl When bumping the gio-unix-2.0 dependency (or glib-2.0 in general),
dnl remember to bump GLIB_VERSION_MIN_REQUIRED and
dnl GLIB_VERSION_MAX_ALLOWED in Makefile.am
Final excision of libgsystem dependency Lots and lots of preparation led to this moment - when nothing apparent changes for users! Woo! But seriously, having the extra dependency is a minor annoyance, and in the big picture I think the libgsystem idea was wrong - we need to land things in GLib, and use git submodules for API-unstable or Linux-specific sharing. For a lot of OSTree, the libgsystem `GFile*` orientation was also wrong, we really want fd-relative. Closes: #444 Approved by: jlebon
2016-06-23 03:12:31 +03:00
GIO_DEPENDENCY="gio-unix-2.0 >= 2.40.0"
build: Remove --enable-embedded-dependencies This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
2014-04-22 17:08:35 +04:00
PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
deltas: Link to liblzma, add internal API to use it For future static deltas work, we'll be linking to liblzma. Since it's fairly widespread, let's just make it a hard dependency.
2014-04-29 16:56:05 +04:00
dnl 5.1.0 is an arbitrary version here
build: We also work OK with LZMA 5.0 This is the version that's in Slackware at the moment at least.
2014-09-08 18:35:32 +04:00
PKG_CHECK_MODULES(OT_DEP_LZMA, liblzma >= 5.0.5)
deltas: Link to liblzma, add internal API to use it For future static deltas work, we'll be linking to liblzma. Since it's fairly widespread, let's just make it a hard dependency.
2014-04-29 16:56:05 +04:00
Add explicit zlib dependency Needed for CRC32 computations.
2015-02-23 22:47:56 +03:00
dnl Needed for rollsum
PKG_CHECK_MODULES(OT_DEP_ZLIB, zlib)
deploy: Set the immutable bit on the deployment root This prevents people from creating new directories there and expecting them to be persisted. The OSTree model has all local state to be in /etc and /var. This introduces a compile-time dependency on libe2fsprogs. We're only doing this for the root directory at the moment. https://bugzilla.gnome.org/show_bug.cgi?id=728006
2014-05-30 18:02:01 +04:00
dnl We're not actually linking to this, just using the header
PKG_CHECK_MODULES(OT_DEP_E2P, e2p)
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
dnl Arbitrary version that's in CentOS7.2 now
CURL_DEPENDENCY=7.29.0
AC_ARG_WITH(curl,
AS_HELP_STRING([--with-curl], [Use libcurl @<:@default=no@:>@]),
[], [with_curl=no])
AS_IF([test x$with_curl != xno ], [
PKG_CHECK_MODULES(OT_DEP_CURL, libcurl >= $CURL_DEPENDENCY)
with_curl=yes
AC_DEFINE([HAVE_LIBCURL], 1, [Define if we have libcurl.pc])
dnl Currently using libcurl requires soup for trivial-httpd for tests
with_soup_default=yes
], [with_soup_default=check])
AM_CONDITIONAL(USE_CURL, test x$with_curl != xno)
main: Make ostree --version output YAML (and add gitrev) I learned today that `docker version` does this and I really like the idea. While we have the patient open, also add the gitrev with code taken from https://github.com/projectatomic/rpm-ostree/pull/584 Closes: #691 Approved by: giuseppe
2017-02-17 18:22:43 +03:00
if test x$with_curl = xyes; then OSTREE_FEATURES="$OSTREE_FEATURES libcurl"; fi
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
build: Remind about bumping related versions Closes: #295 Approved by: cgwalters
2016-05-13 08:59:10 +03:00
dnl When bumping the libsoup-2.4 dependency, remember to bump
dnl SOUP_VERSION_MIN_REQUIRED and SOUP_VERSION_MAX_ALLOWED in
dnl Makefile.am
build: Remove --enable-embedded-dependencies This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
2014-04-22 17:08:35 +04:00
SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
AC_ARG_WITH(soup,
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
AS_HELP_STRING([--with-soup], [Use libsoup @<:@default=yes@:>@]),
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
[], [with_soup=$with_soup_default])
AS_IF([test x$with_soup != xno], [
Add --enable-libsoup-client-certs The goal of this is to hard-fail if the API isn't present in the buildroot, as some downstreams may explicitly require it.
2014-06-26 15:54:41 +04:00
AC_ARG_ENABLE(libsoup_client_certs,
AS_HELP_STRING([--enable-libsoup-client-certs],
[Require availability of new enough libsoup TLS client cert API (default: auto)]),,
[enable_libsoup_client_certs=auto])
build: Remove --enable-embedded-dependencies This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
2014-04-22 17:08:35 +04:00
AC_MSG_CHECKING([for $SOUP_DEPENDENCY])
PKG_CHECK_EXISTS($SOUP_DEPENDENCY, have_soup=yes, have_soup=no)
AC_MSG_RESULT([$have_soup])
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
AS_IF([ test x$have_soup = xno && test x$with_soup != xcheck], [
AC_MSG_ERROR([libsoup is enabled but could not be found])
build: Remove --enable-embedded-dependencies This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
2014-04-22 17:08:35 +04:00
])
AS_IF([test x$have_soup = xyes], [
PKG_CHECK_MODULES(OT_DEP_SOUP, $SOUP_DEPENDENCY)
syntax-check: quote the first argument to AC_DEFINE Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-01-30 17:06:22 +03:00
AC_DEFINE([HAVE_LIBSOUP], 1, [Define if we have libsoup.pc])
build: Remove --enable-embedded-dependencies This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
2014-04-22 17:08:35 +04:00
with_soup=yes
pull: Add tls-client-cert-{path,key} (if we have new enough libsoup) This is an actually working version of client-side certificates. Depends on: See: https://bugzilla.gnome.org/show_bug.cgi?id=334021 We detect whether libsoup is new enough for this. https://bugzilla.gnome.org/show_bug.cgi?id=729356
2014-05-01 20:55:13 +04:00
save_CFLAGS=$CFLAGS
CFLAGS=$OT_DEP_SOUP_CFLAGS
have_libsoup_client_certs=no
AC_CHECK_DECL([SOUP_SESSION_TLS_INTERACTION], [
syntax-check: quote the first argument to AC_DEFINE Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-01-30 17:06:22 +03:00
AC_DEFINE([HAVE_LIBSOUP_CLIENT_CERTS], 1, [Define if we have libsoup client certs])
pull: Add tls-client-cert-{path,key} (if we have new enough libsoup) This is an actually working version of client-side certificates. Depends on: See: https://bugzilla.gnome.org/show_bug.cgi?id=334021 We detect whether libsoup is new enough for this. https://bugzilla.gnome.org/show_bug.cgi?id=729356
2014-05-01 20:55:13 +04:00
have_libsoup_client_certs=yes
], [], [#include <libsoup/soup.h>])
Add --enable-libsoup-client-certs The goal of this is to hard-fail if the API isn't present in the buildroot, as some downstreams may explicitly require it.
2014-06-26 15:54:41 +04:00
AS_IF([test x$enable_libsoup_client_certs = xyes && test x$have_libsoup_client_certs != xyes], [
AC_MSG_ERROR([libsoup client certs explicitly requested but not found])
])
pull: Add tls-client-cert-{path,key} (if we have new enough libsoup) This is an actually working version of client-side certificates. Depends on: See: https://bugzilla.gnome.org/show_bug.cgi?id=334021 We detect whether libsoup is new enough for this. https://bugzilla.gnome.org/show_bug.cgi?id=729356
2014-05-01 20:55:13 +04:00
CFLAGS=$save_CFLAGS
build: Remove --enable-embedded-dependencies This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
2014-04-22 17:08:35 +04:00
], [
with_soup=no
])
], [ with_soup=no ])
main: Make ostree --version output YAML (and add gitrev) I learned today that `docker version` does this and I really like the idea. While we have the patient open, also add the gitrev with code taken from https://github.com/projectatomic/rpm-ostree/pull/584 Closes: #691 Approved by: giuseppe
2017-02-17 18:22:43 +03:00
if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
pull: Add tls-client-cert-{path,key} (if we have new enough libsoup) This is an actually working version of client-side certificates. Depends on: See: https://bugzilla.gnome.org/show_bug.cgi?id=334021 We detect whether libsoup is new enough for this. https://bugzilla.gnome.org/show_bug.cgi?id=729356
2014-05-01 20:55:13 +04:00
AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes)
Support building with embedded libsoup
2012-06-15 00:22:23 +04:00
Disable "ostree trivial-httpd" by default now This goes farther along the path of deprecating it; consumers should have been ported at this point. Though probably a lot of people may still use `rpm-ostree-toolbox`. Closes: #723 Approved by: jlebon
2017-03-08 01:32:50 +03:00
AC_ARG_ENABLE(trivial-httpd-cmdline,
[AS_HELP_STRING([--enable-trivial-httpd-cmdline],
[Continue to support "ostree trivial-httpd" [default=no]])],,
enable_trivial_httpd_cmdline=no)
Don't install trivial-httpd man page if not enabled I just noticed this scroll by in a file listing. Closes: #905 Approved by: jlebon
2017-06-02 22:26:26 +03:00
AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
Disable "ostree trivial-httpd" by default now This goes farther along the path of deprecating it; consumers should have been ported at this point. Though probably a lot of people may still use `rpm-ostree-toolbox`. Closes: #723 Approved by: jlebon
2017-03-08 01:32:50 +03:00
[AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
)
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests])
])
AM_CONDITIONAL(USE_CURL_OR_SOUP, test x$with_curl != xno || test x$with_soup != xno)
AS_IF([test x$with_curl != xno || test x$with_soup != xno],
[AC_DEFINE([HAVE_LIBCURL_OR_LIBSOUP], 1, [Define if we have soup or curl])])
AS_IF([test x$with_curl = xyes], [fetcher_backend=curl], [test x$with_soup = xyes], [fetcher_backend=libsoup], [fetcher_backend=none])
Install a shared library This required a fair bit of surgery because previously ostree.h included otutil.h, but that's supposed to be a private library.
2013-07-27 03:25:07 +04:00
m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
GOBJECT_INTROSPECTION_CHECK([1.34.0])
])
build: Also make gjs-based tests conditional on introspection support Since they use imports.gi.OSTree.
2013-10-11 19:50:15 +04:00
AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test "x$found_introspection" = xyes)
Install a shared library This required a fair bit of surgery because previously ostree.h included otutil.h, but that's supposed to be a private library.
2013-07-27 03:25:07 +04:00
core: Use libgpgme to add GPG signatures to detached metadata for commit object Add an optional dependency on gpgme to add GPG signatures into the detached metadata, with the key "ostree.gpgsigs", as an "aay", an array of signatures (treated as binary data). The commit command gains a --gpg-sign=<key-id> argument. Also add an argument --gpg-homedir to set the GPG homedir where we look for keyrings.
2013-09-03 05:43:49 +04:00
LIBGPGME_DEPENDENCY="1.1.8"
build: Use threadsafe GPGME https://bugzilla.gnome.org/show_bug.cgi?id=761863
2016-02-22 23:04:38 +03:00
PKG_CHECK_MODULES(OT_DEP_GPGME, gpgme-pthread >= $LIBGPGME_DEPENDENCY, have_gpgme=yes, [
m4_ifdef([AM_PATH_GPGME_PTHREAD], [
AM_PATH_GPGME_PTHREAD($LIBGPGME_DEPENDENCY, have_gpgme=yes, have_gpgme=no)
build: Use both pkg-config and AM_PATH_GPGME Apparently OpenEmbeddeded only supports pkg-config (and includes gpgme.pc in its content), and Fedora only has the latter. So do both.
2015-03-11 22:58:42 +03:00
],[ have_gpgme=no ])
])
configure.ac: Make gpgme a hard dependency In anticipation of API enhancements for GPG signature verification, which would otherwise require a non-functional stub version were GPGME excluded. GPGME is a pretty lightweight dependency, and the motivation to exclude it is not clear.
2015-03-11 18:34:59 +03:00
AS_IF([ test x$have_gpgme = xno ], [
build: Use threadsafe GPGME https://bugzilla.gnome.org/show_bug.cgi?id=761863
2016-02-22 23:04:38 +03:00
AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later])
build: Use both pkg-config and AM_PATH_GPGME Apparently OpenEmbeddeded only supports pkg-config (and includes gpgme.pc in its content), and Fedora only has the latter. So do both.
2015-03-11 22:58:42 +03:00
])
main: Make ostree --version output YAML (and add gitrev) I learned today that `docker version` does this and I really like the idea. While we have the patient open, also add the gitrev with code taken from https://github.com/projectatomic/rpm-ostree/pull/584 Closes: #691 Approved by: giuseppe
2017-02-17 18:22:43 +03:00
OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
core: Use libgpgme to add GPG signatures to detached metadata for commit object Add an optional dependency on gpgme to add GPG signatures into the detached metadata, with the key "ostree.gpgsigs", as an "aay", an array of signatures (treated as binary data). The commit command gains a --gpg-sign=<key-id> argument. Also add an argument --gpg-homedir to set the GPG homedir where we look for keyrings.
2013-09-03 05:43:49 +04:00
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
Import rofiles-fuse While it's not strictly tied to OSTree, let's move https://github.com/cgwalters/rofiles-fuse in here because: - It's *very* useful in concert with OSTree - It's tiny - We can reuse OSTree's test, documentation, etc. infrastructure One thing to consider also is that at some point we could experiment with writing a FUSE filesystem for OSTree. This could internalize a better equivalent of `--link-checkout-speedup`, but on the other hand, the cost of walking filesystem trees for these types of operations is really quite small. But if we did decide to do more FUSE things in OSTree, this is a step towards that too.
2016-02-10 14:42:54 +03:00
# What's in RHEL7.2.
FUSE_DEPENDENCY="fuse >= 2.9.2"
core: Split pull functionality into separate ostree-pull binary This is to avoid everything depending on libsoup.
2011-11-30 18:21:14 +04:00
build: Make gtk-doc optional This is similar to what's done in glib.
2015-06-29 20:20:57 +03:00
# check for gtk-doc
m4_ifdef([GTK_DOC_CHECK], [
Add gtk-doc support Yes, it's really me. Colin Walters. Writing documentation. You don't need to do a DNA test.
2013-08-17 06:54:35 +04:00
GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
build: Make gtk-doc optional This is similar to what's done in glib.
2015-06-29 20:20:57 +03:00
],[
enable_gtk_doc=no
AM_CONDITIONAL([ENABLE_GTK_DOC], false)
])
build: Add --disable-man Gnome Continuous doesn't have docbook, so copy what we do for glib.
2016-01-28 23:22:10 +03:00
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
[generate man pages [default=auto]])],,
enable_man=maybe)
AS_IF([test "$enable_man" != no], [
AC_PATH_PROG([XSLTPROC], [xsltproc])
AS_IF([test -z "$XSLTPROC"], [
AS_IF([test "$enable_man" = yes], [
AC_MSG_ERROR([xsltproc is required for --enable-man])
])
enable_man=no
build: Fix disabling --enable-man if xsltproc is not available If --enable-man=maybe (the default), and xsltproc is not available, the configuration code would check for it, correctly set enable_man=no, then incorrectly overwrite that with enable_man=yes, which would result in later trying to execute $(XSLTPROC) when it’s empty. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #720 Approved by: cgwalters
2017-03-06 15:19:28 +03:00
],[
enable_man=yes
build: Add --disable-man Gnome Continuous doesn't have docbook, so copy what we do for glib.
2016-01-28 23:22:10 +03:00
])
])
AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
build: Add --disable-documentation flag We may have xsltproc, but no DTDs.
2012-01-14 01:30:39 +04:00
oxidation: Add implementation of bupsplit in Rust This is an initial drop of "oxidation", or adding implementation of components in Rust. The bupsplit code is a good target - no dependencies, just computation. Translation into Rust had a few twists - - The C code relies a lot on overflowing unsigned ints, and also on the C promotion rules for e.g. `uint8_t -> int32_t` - There were some odd loops that I introduced bugs in while translating...in particular, the function always returns `len`, but I mistakenly translated to `len+1`, resulting in an OOB read on the C side, which was hard to debug. On the plus side, an off-by-one array indexing in the Rust code paniced nicely. In practice, we'll need a lot more build infrastructure to make this work, such as using `cargo vendor` when producing build artifacts for example. Also, Cargo is yet another thing we need to cache. Where do we go with this? Well, I think we should merge this, it's not a lot of code. We can just have it be an alternative CI target. Should we do a lot more right now? Probably not immediately, but I find the medium/long term prospects pretty exciting! Closes: #656 Approved by: jlebon
2017-01-25 05:43:53 +03:00
AC_ARG_ENABLE(rust,
[AS_HELP_STRING([--enable-rust],
[Compile Rust code instead of C [default=no]])],,
[enable_rust=no; rust_debug_release=no])
AS_IF([test "$enable_rust" = yes], [
AC_PATH_PROG([cargo], [cargo])
AS_IF([test -z "$cargo"], [AC_MSG_ERROR([cargo is required for --enable-rust])])
AC_PATH_PROG([rustc], [rustc])
AS_IF([test -z "$rustc"], [AC_MSG_ERROR([rustc is required for --enable-rust])])
dnl These bits based on gnome:librsvg/configure.ac
dnl By default, we build in public release mode.
AC_ARG_ENABLE(rust-debug,
AC_HELP_STRING([--enable-rust-debug],
[Build Rust code with debugging information [default=no]]),
[rust_debug_release=$enableval],
[rust_debug_release=release])
AC_MSG_CHECKING(whether to build Rust code with debugging information)
if test "x$rust_debug_release" = "xyes" ; then
rust_debug_release=debug
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
RUST_TARGET_SUBDIR=${rust_debug_release}
AC_SUBST([RUST_TARGET_SUBDIR])
])
AM_CONDITIONAL(RUST_DEBUG, [test "x$rust_debug_release" = "xdebug"])
AM_CONDITIONAL(ENABLE_RUST, [test "$enable_rust" != no])
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
AC_ARG_WITH(libarchive,
AS_HELP_STRING([--without-libarchive], [Do not use libarchive]),
:, with_libarchive=maybe)
configure.ac: Fix checks for libarchive When configuring without passing --enable-triggers-only, checks for libarchive were not being done. Shuffling around the checks solves the issue.
2012-08-28 17:36:07 +04:00
AS_IF([ test x$with_libarchive != xno ], [
build: Note the status of libsoup-gnome and libarchive So fewer people accidentally compile without one.
2012-02-25 00:40:52 +04:00
AC_MSG_CHECKING([for $LIBARCHIVE_DEPENDENCY])
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
PKG_CHECK_EXISTS($LIBARCHIVE_DEPENDENCY, have_libarchive=yes, have_libarchive=no)
build: Note the status of libsoup-gnome and libarchive So fewer people accidentally compile without one.
2012-02-25 00:40:52 +04:00
AC_MSG_RESULT([$have_libarchive])
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
AS_IF([ test x$have_libarchive = xno && test x$with_libarchive != xmaybe ], [
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
AC_MSG_ERROR([libarchive is enabled but could not be found])
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
])
AS_IF([ test x$have_libarchive = xyes], [
syntax-check: quote the first argument to AC_DEFINE Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-01-30 17:06:22 +03:00
AC_DEFINE([HAVE_LIBARCHIVE], 1, [Define if we have libarchive.pc])
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
PKG_CHECK_MODULES(OT_DEP_LIBARCHIVE, $LIBARCHIVE_DEPENDENCY)
repo: Use non-deprecated API with sufficiently new libarchive Based on a patch Tobias Hunger <tobias.hunger@gmail.com>
2013-08-30 12:50:29 +04:00
save_LIBS=$LIBS
LIBS=$OT_DEP_LIBARCHIVE_LIBS
AC_CHECK_FUNCS(archive_read_support_filter_all)
LIBS=$save_LIBS
build: Note the status of libsoup-gnome and libarchive So fewer people accidentally compile without one.
2012-02-25 00:40:52 +04:00
with_libarchive=yes
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
], [
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
with_libarchive=no
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
])
build: Add --enable-triggers-only For bootstrapping gnome-ostree, we need to install the triggers early on, before we actually build the real ostree binary.
2012-08-26 20:46:14 +04:00
], [ with_libarchive=no ])
main: Make ostree --version output YAML (and add gitrev) I learned today that `docker version` does this and I really like the idea. While we have the patient open, also add the gitrev with code taken from https://github.com/projectatomic/rpm-ostree/pull/584 Closes: #691 Approved by: giuseppe
2017-02-17 18:22:43 +03:00
if test x$with_libarchive != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libarchive"; fi
core: Support for committing from any libarchive-supported format We really want the ability to take a .tar.gz and directly import it into a repository, without creating a temporary filesystem tree. First, doing it this way is significantly faster. Also, this allows us to handle importing tar files with e.g. uid 0 files into packed repositories as non-root, which is very useful for tests and builds.
2011-12-04 21:14:08 +04:00
AM_CONDITIONAL(USE_LIBARCHIVE, test $with_libarchive != no)
Add SELinux support The trees as shipped come with /usr/etc, which should just be labeled as usr_t. When we do a deployment, we need to relabel the copies of the files we're making in /etc. SELinux support is compile and runtime optional.
2014-01-29 18:22:16 +04:00
dnl This is what is in RHEL7 anyways
build: Drop SELinux required version a bit earlier Apparently EPEL7 only has 2.1.13, but we should be fine with that.
2014-02-02 20:53:22 +04:00
SELINUX_DEPENDENCY="libselinux >= 2.1.13"
Add SELinux support The trees as shipped come with /usr/etc, which should just be labeled as usr_t. When we do a deployment, we need to relabel the copies of the files we're making in /etc. SELinux support is compile and runtime optional.
2014-01-29 18:22:16 +04:00
AC_ARG_WITH(selinux,
AS_HELP_STRING([--without-selinux], [Do not use SELinux]),
:, with_selinux=maybe)
AS_IF([ test x$with_selinux != xno ], [
AC_MSG_CHECKING([for $SELINUX_DEPENDENCY])
PKG_CHECK_EXISTS($SELINUX_DEPENDENCY, have_selinux=yes, have_selinux=no)
AC_MSG_RESULT([$have_selinux])
AS_IF([ test x$have_selinux = xno && test x$with_selinux != xmaybe ], [
AC_MSG_ERROR([SELinux is enabled but could not be found])
])
AS_IF([ test x$have_selinux = xyes], [
syntax-check: quote the first argument to AC_DEFINE Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-01-30 17:06:22 +03:00
AC_DEFINE([HAVE_SELINUX], 1, [Define if we have libselinux.pc])
Add SELinux support The trees as shipped come with /usr/etc, which should just be labeled as usr_t. When we do a deployment, we need to relabel the copies of the files we're making in /etc. SELinux support is compile and runtime optional.
2014-01-29 18:22:16 +04:00
PKG_CHECK_MODULES(OT_DEP_SELINUX, $SELINUX_DEPENDENCY)
with_selinux=yes
], [
with_selinux=no
])
], [ with_selinux=no ])
main: Make ostree --version output YAML (and add gitrev) I learned today that `docker version` does this and I really like the idea. While we have the patient open, also add the gitrev with code taken from https://github.com/projectatomic/rpm-ostree/pull/584 Closes: #691 Approved by: giuseppe
2017-02-17 18:22:43 +03:00
if test x$with_selinux != xno; then OSTREE_FEATURES="$OSTREE_FEATURES selinux"; fi
Add SELinux support The trees as shipped come with /usr/etc, which should just be labeled as usr_t. When we do a deployment, we need to relabel the copies of the files we're making in /etc. SELinux support is compile and runtime optional.
2014-01-29 18:22:16 +04:00
AM_CONDITIONAL(USE_SELINUX, test $with_selinux != no)
build: Add --with-smack, use it to reset contexts for writing objects At some point we'll want to follow what systemd is doing and add better support for smack, along the lines of `OstreeSePolicy`. However, short term this patch fixes AGL which uses Smack. See: https://jira.automotivelinux.org/browse/SPEC-386 See: https://github.com/ostreedev/ostree/pull/698 Closes: #698 Approved by: OYTIS
2017-02-21 21:58:40 +03:00
AC_ARG_WITH(smack,
AS_HELP_STRING([--with-smack], [Enable smack]),
:, with_smack=no)
AS_IF([ test x$with_smack = xyes], [
AC_DEFINE([WITH_SMACK], 1, [Define if we have smack.pc])
])
AM_CONDITIONAL(USE_SMACK, test $with_smack != no)
build: Various fixes for openssl build This actually worked before because `pkg-config --cflags openssl` is empty, and the linker was satisfying `-lssl -lcrypto` from our indirect dependencies. Also, in fact we *currently* just want `pkg-config libcrypto` i.e. `-lcrypto`, since we aren't actually using openssl to speak TLS. This doesn't actually matter on Fedora at least since they're both in the `openssl-libs` package, but they are separate for a reason. Closes: #749 Approved by: jlebon
2017-03-21 22:07:41 +03:00
dnl begin openssl (really just libcrypto right now)
OPENSSL_DEPENDENCY="libcrypto >= 1.0.1"
core: Support building with OpenSSL for checksums Add an OpenSSL backend to the checksum input stream, which is where we do a lot of checksumming (object commit, static deltas). The raw OpenSSL performance is [approximately double](https://gist.github.com/cgwalters/169349fd1c06fd4fb4d3a7ce33303222) on my laptop; not only does OpenSSL have e.g. hand-tuned x86_64 assembly, the current implementation uses the [Intel SHA extensions](https://en.wikipedia.org/wiki/Intel_SHA_extensions). Another reason to do this is I was idly thinking about adding [Curve25519](https://en.wikipedia.org/wiki/Curve25519) signatures (like e.g. Alpine does) instead of/in addition to GPG. The rationale for that is that GPG is pretty heavyweight, both in code footprint and the simple fact that EC keys are way smaller. I didn't benchmark ostree with this; we have bigger performance problems really like the fact we just malloc way too much. But, it's a step in the right direction I think in combination with the libcurl work where we're linking to openssl anyways. Closes: #738 Approved by: jlebon
2017-03-13 21:41:14 +03:00
AC_ARG_WITH(openssl,
build: Various fixes for openssl build This actually worked before because `pkg-config --cflags openssl` is empty, and the linker was satisfying `-lssl -lcrypto` from our indirect dependencies. Also, in fact we *currently* just want `pkg-config libcrypto` i.e. `-lcrypto`, since we aren't actually using openssl to speak TLS. This doesn't actually matter on Fedora at least since they're both in the `openssl-libs` package, but they are separate for a reason. Closes: #749 Approved by: jlebon
2017-03-21 22:07:41 +03:00
AS_HELP_STRING([--with-openssl], [Enable use of OpenSSL libcrypto (checksums)]),
core: Support building with OpenSSL for checksums Add an OpenSSL backend to the checksum input stream, which is where we do a lot of checksumming (object commit, static deltas). The raw OpenSSL performance is [approximately double](https://gist.github.com/cgwalters/169349fd1c06fd4fb4d3a7ce33303222) on my laptop; not only does OpenSSL have e.g. hand-tuned x86_64 assembly, the current implementation uses the [Intel SHA extensions](https://en.wikipedia.org/wiki/Intel_SHA_extensions). Another reason to do this is I was idly thinking about adding [Curve25519](https://en.wikipedia.org/wiki/Curve25519) signatures (like e.g. Alpine does) instead of/in addition to GPG. The rationale for that is that GPG is pretty heavyweight, both in code footprint and the simple fact that EC keys are way smaller. I didn't benchmark ostree with this; we have bigger performance problems really like the fact we just malloc way too much. But, it's a step in the right direction I think in combination with the libcurl work where we're linking to openssl anyways. Closes: #738 Approved by: jlebon
2017-03-13 21:41:14 +03:00
:, with_openssl=no)
AS_IF([ test x$with_openssl != xno ], [
PKG_CHECK_MODULES(OT_DEP_OPENSSL, $OPENSSL_DEPENDENCY)
AC_DEFINE([HAVE_OPENSSL], 1, [Define if we have openssl])
with_openssl=yes
], [
with_openssl=no
])
if test x$with_openssl != xno; then OSTREE_FEATURES="$OSTREE_FEATURES openssl"; fi
AM_CONDITIONAL(USE_OPENSSL, test $with_openssl != no)
dnl end openssl
lib/repo-finder: Add Avahi based OstreeRepoFinder implementation This is a more complex implementation of OstreeRepoFinder which resolves ref names to remote URIs by looking for refs advertised by peers on the local network using DNS-SD records and mDNS (Avahi). The idea is to allow OS and app updates to be propagated over local networks, without the internet. It requires an OSTree server and code to generate the DNS-SD adverts in order to be fully functional — support for this will be added separately. Unit tests are included. Includes fixes by Krzesimir Nowak <krzesimir@kinvolk.io>. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #924 Approved by: cgwalters
2017-04-19 02:13:28 +03:00
dnl Avahi dependency for finding repos
AVAHI_DEPENDENCY="avahi-client >= 0.6.31 avahi-glib >= 0.6.31"
AC_ARG_WITH(avahi,
AS_HELP_STRING([--without-avahi], [Do not use Avahi]),
:, with_avahi=maybe)
AS_IF([ test x$with_avahi != xno ], [
AC_MSG_CHECKING([for $AVAHI_DEPENDENCY])
PKG_CHECK_EXISTS($AVAHI_DEPENDENCY, have_avahi=yes, have_avahi=no)
AC_MSG_RESULT([$have_avahi])
AS_IF([ test x$have_avahi = xno && test x$with_avahi != xmaybe ], [
AC_MSG_ERROR([Avahi is enabled but could not be found])
])
AS_IF([ test x$have_avahi = xyes], [
AC_DEFINE([HAVE_AVAHI], 1, [Define if we have avahi-client.pc and avahi-glib.pc])
PKG_CHECK_MODULES(OT_DEP_AVAHI, $AVAHI_DEPENDENCY)
with_avahi=yes
], [
with_avahi=no
])
], [ with_avahi=no ])
if test x$with_avahi != xno; then OSTREE_FEATURES="$OSTREE_FEATURES avahi"; fi
AM_CONDITIONAL(USE_AVAHI, test $with_avahi != no)
deploy: Handle a read-only /boot I'd like to encourage people to make OSTree-managed systems more strictly read-only in multiple places. Ideally everywhere is read-only normally besides `/var/`, `/tmp/`, and `/run`. `/boot` is a good example of something to make readonly. Particularly now that there's work on the `admin unlock` verb, we need to protect the system better against things like `rpm -Uvh kernel.rpm` because the RPM-packaged kernel won't understand how to do OSTree right. In order to make this work of course, we *do* need to remount `/boot` as writable when we're doing an upgrade that changes the kernel configuration. So the strategy is to detect whether it's read-only, and if so, temporarily mount read-write, then remount read-only when the upgrade is done. We can generalize this in the future to also do `/etc` (and possibly `/sysroot/ostree/` although that gets tricky). One detail: In order to detect "is this path a mountpoint" is nontrivial - I looked at copying the systemd code, but the right place is to use `libmount` anyways.
2016-03-21 17:37:38 +03:00
dnl This is what is in RHEL7.2 right now, picking it arbitrarily
LIBMOUNT_DEPENDENCY="mount >= 2.23.0"
AC_ARG_WITH(libmount,
AS_HELP_STRING([--without-libmount], [Do not use libmount]),
:, with_libmount=maybe)
AS_IF([ test x$with_libmount != xno ], [
AC_MSG_CHECKING([for $LIBMOUNT_DEPENDENCY])
PKG_CHECK_EXISTS($LIBMOUNT_DEPENDENCY, have_libmount=yes, have_libmount=no)
AC_MSG_RESULT([$have_libmount])
AS_IF([ test x$have_libmount = xno && test x$with_libmount != xmaybe ], [
AC_MSG_ERROR([libmount is enabled but could not be found])
])
AS_IF([ test x$have_libmount = xyes], [
AC_DEFINE([HAVE_LIBMOUNT], 1, [Define if we have libmount.pc])
PKG_CHECK_MODULES(OT_DEP_LIBMOUNT, $LIBMOUNT_DEPENDENCY)
with_libmount=yes
deploy/libmount: Fix build with old util-linux 2.23 (CentOS7) https://github.com/ostreedev/ostree/pull/705 broke the build on CentOS 7 which only has util-linux 2.23. When I was thinking about this, I realized that there must really be a way to make this safe even for older versions. Looking at that version of util-linux, all we need to do is invert the order of frees so we `mnt_free_table()` *before* `mnt_free_cache()`, like util-linux does: https://github.com/karelzak/util-linux/blob/stable/v2.23/sys-utils/eject.c#L1131 We still use the `_unref()` versions if available. I also fixed the ordering there too for double plus redundant safety. Closes: #712 Approved by: jlebon
2017-02-24 18:18:27 +03:00
save_LIBS=$LIBS
LIBS=$OT_DEP_LIBMOUNT_LIBS
AC_CHECK_FUNCS(mnt_unref_cache)
LIBS=$save_LIBS
deploy: Handle a read-only /boot I'd like to encourage people to make OSTree-managed systems more strictly read-only in multiple places. Ideally everywhere is read-only normally besides `/var/`, `/tmp/`, and `/run`. `/boot` is a good example of something to make readonly. Particularly now that there's work on the `admin unlock` verb, we need to protect the system better against things like `rpm -Uvh kernel.rpm` because the RPM-packaged kernel won't understand how to do OSTree right. In order to make this work of course, we *do* need to remount `/boot` as writable when we're doing an upgrade that changes the kernel configuration. So the strategy is to detect whether it's read-only, and if so, temporarily mount read-write, then remount read-only when the upgrade is done. We can generalize this in the future to also do `/etc` (and possibly `/sysroot/ostree/` although that gets tricky). One detail: In order to detect "is this path a mountpoint" is nontrivial - I looked at copying the systemd code, but the right place is to use `libmount` anyways.
2016-03-21 17:37:38 +03:00
], [
with_libmount=no
])
], [ with_libmount=no ])
main: Make ostree --version output YAML (and add gitrev) I learned today that `docker version` does this and I really like the idea. While we have the patient open, also add the gitrev with code taken from https://github.com/projectatomic/rpm-ostree/pull/584 Closes: #691 Approved by: giuseppe
2017-02-17 18:22:43 +03:00
if test x$with_libmount != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libmount"; fi
deploy: Handle a read-only /boot I'd like to encourage people to make OSTree-managed systems more strictly read-only in multiple places. Ideally everywhere is read-only normally besides `/var/`, `/tmp/`, and `/run`. `/boot` is a good example of something to make readonly. Particularly now that there's work on the `admin unlock` verb, we need to protect the system better against things like `rpm -Uvh kernel.rpm` because the RPM-packaged kernel won't understand how to do OSTree right. In order to make this work of course, we *do* need to remount `/boot` as writable when we're doing an upgrade that changes the kernel configuration. So the strategy is to detect whether it's read-only, and if so, temporarily mount read-write, then remount read-only when the upgrade is done. We can generalize this in the future to also do `/etc` (and possibly `/sysroot/ostree/` although that gets tricky). One detail: In order to detect "is this path a mountpoint" is nontrivial - I looked at copying the systemd code, but the right place is to use `libmount` anyways.
2016-03-21 17:37:38 +03:00
AM_CONDITIONAL(USE_LIBMOUNT, test $with_libmount != no)
Import rofiles-fuse While it's not strictly tied to OSTree, let's move https://github.com/cgwalters/rofiles-fuse in here because: - It's *very* useful in concert with OSTree - It's tiny - We can reuse OSTree's test, documentation, etc. infrastructure One thing to consider also is that at some point we could experiment with writing a FUSE filesystem for OSTree. This could internalize a better equivalent of `--link-checkout-speedup`, but on the other hand, the cost of walking filesystem trees for these types of operations is really quite small. But if we did decide to do more FUSE things in OSTree, this is a step towards that too.
2016-02-10 14:42:54 +03:00
# Enabled by default because I think people should use it.
AC_ARG_ENABLE(rofiles-fuse,
[AS_HELP_STRING([--enable-rofiles-fuse],
[generate rofiles-fuse helper [default=yes]])],,
enable_rofiles_fuse=yes)
Fix --enable_rofiles_fuse=no build Closes: #276 Approved by: cgwalters
2016-04-25 14:57:03 +03:00
AS_IF([ test x$enable_rofiles_fuse != xno ], [
Import rofiles-fuse While it's not strictly tied to OSTree, let's move https://github.com/cgwalters/rofiles-fuse in here because: - It's *very* useful in concert with OSTree - It's tiny - We can reuse OSTree's test, documentation, etc. infrastructure One thing to consider also is that at some point we could experiment with writing a FUSE filesystem for OSTree. This could internalize a better equivalent of `--link-checkout-speedup`, but on the other hand, the cost of walking filesystem trees for these types of operations is really quite small. But if we did decide to do more FUSE things in OSTree, this is a step towards that too.
2016-02-10 14:42:54 +03:00
PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
], [enable_rofiles_fuse=no])
AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)
Add --with-dracut This installs a Dracut module which parses the ostree= kernel command line argument, and if given, sets up the OS/ at /sysroot, which systemd's switch-root then moves into. This only works if dracut is configured to use systemd itself.
2013-06-03 22:12:40 +04:00
AC_ARG_WITH(dracut,
AS_HELP_STRING([--with-dracut],
[Install dracut module (default: no)]),,
[with_dracut=no])
build: Introduce --with-dracut=yesbutnoconf It's actually just easier for build systems (e.g. rpm-ostree) using dracut to use `--add ostree` rather than indirecting through the conf file. This makes it easier for yum-managed systems to install ostree without side effects. Closes: #279 Approved by: gatispaeglis
2016-04-28 18:34:27 +03:00
case x$with_dracut in
xno) ;;
xyes) ;;
xyesbutnoconf) ;;
*) AC_MSG_ERROR([Unknown --with-dracut value $with_dracut])
esac
AM_CONDITIONAL(BUILDOPT_DRACUT, test x$with_dracut = xyes || test x$with_dracut = xyesbutnoconf)
AM_CONDITIONAL(BUILDOPT_DRACUT_CONF, test x$with_dracut = xyes)
Add --with-dracut This installs a Dracut module which parses the ostree= kernel command line argument, and if given, sets up the OS/ at /sysroot, which systemd's switch-root then moves into. This only works if dracut is configured to use systemd itself.
2013-06-03 22:12:40 +04:00
Add support for mkinitcpio https://bugzilla.gnome.org/show_bug.cgi?id=710682
2013-10-23 00:04:32 +04:00
AC_ARG_WITH(mkinitcpio,
AS_HELP_STRING([--with-mkinitcpio],
[Install mkinitcpio module (default: no)]),,
[with_mkinitcpio=no])
AM_CONDITIONAL(BUILDOPT_MKINITCPIO, test x$with_mkinitcpio = xyes)
lib: Use sd_journal directly (optionally) This was the last caller of libgsystem that isn't `gs_file_get_path_cached()`. I think the use case ostree has where the same code can be called via command line and via a shared library *and* via a daemon is rather unusual, so let's just copy the code for logging from libgsystem into here. For example rpm-ostree hard depends on a daemon mode, so it'll just use `sd_journal` directly. Closes: #341 Approved by: jlebon
2016-06-14 20:12:21 +03:00
dnl We have separate checks for libsystemd and the unit dir for historical reasons
PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd], [have_libsystemd=yes], [have_libsystemd=no])
AM_CONDITIONAL(BUILDOPT_LIBSYSTEMD, test x$have_libsystemd = xyes)
AM_COND_IF(BUILDOPT_LIBSYSTEMD,
AC_DEFINE([HAVE_LIBSYSTEMD], 1, [Define if we have libsystemd]))
AS_IF([test "x$have_libsystemd" = "xyes"], [
Add support for mkinitcpio https://bugzilla.gnome.org/show_bug.cgi?id=710682
2013-10-23 00:04:32 +04:00
with_systemd=yes
Install systemd units in the right location Debian uses /lib/systemd/system for system unit files, while i'm putting ostree under the /usr prefix which means the hardcoded path fails. Leave it to configure to work out the right location for systemd units (method copied from pollkit). Furthermore instead of installing the unit in local-fs.target.wants by hand add a [Install] section so systemctl enable does the right thing https://bugzilla.gnome.org/show_bug.cgi?id=705864
2013-08-12 21:27:27 +04:00
AC_ARG_WITH([systemdsystemunitdir],
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
[],
[with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
])
Switch to using a systemd generator for /var If one wants to set up a mount for `/var` in `/etc/fstab`, it won't be mounted since `ostree-prepare-root` set up a bind mount for `/var` to `/sysroot/ostree/$stateroot/var`, and systemd will take the already extant mount over what's in `/etc/fstab`. There are a few options to fix this, but what I settled on is parsing `/etc/fstab` in a generator (exactly like `systemd-fstab-generator` does), except here we look for an explicit mount for `/var`, and if one *isn't* found, synthesize the default ostree mount to the stateroot. Another nice property is that if an admin creates a `var.mount` unit in `/etc` for example, that will also override our mount. Note that today ostree doesn't hard depend on systemd, so this behavior only kicks in if we're built with systemd *and* libmount support (for parsing `/etc/fstab`). I didn't really test that case though. Initially I started writing this as a "pure libc" program, but at one point decided to use `libostree.so` to find the booted deployment. That didn't work out because `/boot` wasn't necessarily mounted and hence we couldn't find the bootloader config. A leftover artifact from this is that the generator code calls into libostree via the "cmd private" infrastructure. But it's an easy way to share code, and doesn't hurt. Closes: #859 Approved by: jlebon
2017-05-11 21:54:12 +03:00
AC_ARG_WITH([systemdsystemgeneratordir],
AS_HELP_STRING([--with-systemdsystemgeneratordir=DIR], [Directory for systemd generators]),
[],
[with_systemdsystemgeneratordir=$($PKG_CONFIG --variable=systemdsystemgeneratordir systemd)])
AS_IF([test "x$with_systemdsystemgeneratordir" != "xno"], [
AC_SUBST([systemdsystemgeneratordir], [$with_systemdsystemgeneratordir])
])
Install systemd units in the right location Debian uses /lib/systemd/system for system unit files, while i'm putting ostree under the /usr prefix which means the hardcoded path fails. Leave it to configure to work out the right location for systemd units (method copied from pollkit). Furthermore instead of installing the unit in local-fs.target.wants by hand add a [Install] section so systemctl enable does the right thing https://bugzilla.gnome.org/show_bug.cgi?id=705864
2013-08-12 21:27:27 +04:00
])
Add support for mkinitcpio https://bugzilla.gnome.org/show_bug.cgi?id=710682
2013-10-23 00:04:32 +04:00
AM_CONDITIONAL(BUILDOPT_SYSTEMD, test x$with_systemd = xyes)
Switch to using a systemd generator for /var If one wants to set up a mount for `/var` in `/etc/fstab`, it won't be mounted since `ostree-prepare-root` set up a bind mount for `/var` to `/sysroot/ostree/$stateroot/var`, and systemd will take the already extant mount over what's in `/etc/fstab`. There are a few options to fix this, but what I settled on is parsing `/etc/fstab` in a generator (exactly like `systemd-fstab-generator` does), except here we look for an explicit mount for `/var`, and if one *isn't* found, synthesize the default ostree mount to the stateroot. Another nice property is that if an admin creates a `var.mount` unit in `/etc` for example, that will also override our mount. Note that today ostree doesn't hard depend on systemd, so this behavior only kicks in if we're built with systemd *and* libmount support (for parsing `/etc/fstab`). I didn't really test that case though. Initially I started writing this as a "pure libc" program, but at one point decided to use `libostree.so` to find the booted deployment. That didn't work out because `/boot` wasn't necessarily mounted and hence we couldn't find the bootloader config. A leftover artifact from this is that the generator code calls into libostree via the "cmd private" infrastructure. But it's an easy way to share code, and doesn't hurt. Closes: #859 Approved by: jlebon
2017-05-11 21:54:12 +03:00
dnl If we have both, we use the "new /var" model with ostree-system-generator
AM_CONDITIONAL(BUILDOPT_SYSTEMD_AND_LIBMOUNT,[test x$with_systemd = xyes && test x$with_libmount = xyes])
AM_COND_IF(BUILDOPT_SYSTEMD_AND_LIBMOUNT,
AC_DEFINE([BUILDOPT_LIBSYSTEMD_AND_LIBMOUNT], 1, [Define if systemd and libmount]))
Install systemd units in the right location Debian uses /lib/systemd/system for system unit files, while i'm putting ostree under the /usr prefix which means the hardcoded path fails. Leave it to configure to work out the right location for systemd units (method copied from pollkit). Furthermore instead of installing the unit in local-fs.target.wants by hand add a [Install] section so systemctl enable does the right thing https://bugzilla.gnome.org/show_bug.cgi?id=705864
2013-08-12 21:27:27 +04:00
Introducing ostree-grub-generator ostree-grub-generator can be used to customize the generated grub.cfg file. Compile time decision ostree-grub-generator vs grub2-mkconfig can be overwritten with the OSTREE_GRUB2_EXEC envvar - useful for auto tests and OS installers. Why this alternative approach: 1) The current approach is less flexible than using a custom 'ostree-grub-generator' script. Each system can adjust this script for its needs, instead of using the hardcoded values from ostree-bootloader-grub2.c. 2) Too much overhead on embedded to generate grub.cfg via /etc/grub.d/ configuration files. It is still possible to do so, even with this patch applied. No need to install grub2 package on a target device. 3) The grub2-mkconfig code path has other issues: https://bugzilla.gnome.org/show_bug.cgi?id=761180 Task: https://bugzilla.gnome.org/show_bug.cgi?id=762220 Closes: #228 Approved by: cgwalters
2016-04-01 14:51:18 +03:00
AC_ARG_WITH(builtin-grub2-mkconfig,
Fix AS_HELP_STRING for builtin grub2 mkconfig Closes: #253 Approved by: giuseppe
2016-04-12 12:26:27 +03:00
AS_HELP_STRING([--with-builtin-grub2-mkconfig],
Introducing ostree-grub-generator ostree-grub-generator can be used to customize the generated grub.cfg file. Compile time decision ostree-grub-generator vs grub2-mkconfig can be overwritten with the OSTREE_GRUB2_EXEC envvar - useful for auto tests and OS installers. Why this alternative approach: 1) The current approach is less flexible than using a custom 'ostree-grub-generator' script. Each system can adjust this script for its needs, instead of using the hardcoded values from ostree-bootloader-grub2.c. 2) Too much overhead on embedded to generate grub.cfg via /etc/grub.d/ configuration files. It is still possible to do so, even with this patch applied. No need to install grub2 package on a target device. 3) The grub2-mkconfig code path has other issues: https://bugzilla.gnome.org/show_bug.cgi?id=761180 Task: https://bugzilla.gnome.org/show_bug.cgi?id=762220 Closes: #228 Approved by: cgwalters
2016-04-01 14:51:18 +03:00
[Use a builtin minimal grub2-mkconfig to generate a GRUB2 configuration file (default: no)]),,
[with_builtin_grub2_mkconfig=no])
AM_CONDITIONAL(BUILDOPT_BUILTIN_GRUB2_MKCONFIG, test x$with_builtin_grub2_mkconfig = xyes)
AM_COND_IF(BUILDOPT_BUILTIN_GRUB2_MKCONFIG,
build: Find grub2-mkconfig a bit more automagically If one happens to not have grub2 installed, the previous commit would cause us to fall back to `grub-mkconfig` with bad results. We should likely just do dynamic detection and avoid pain, but there's no harm in also allowing this to be statically determined. The automagic here is that if `/etc/os-release` says `ID_LIKE=fedora`, we know to use `grub2-mkconfig`. But distro scripts should set this in the build configurations using `--with-grub2-mkconfig=`. Closes: #240 Approved by: jlebon
2016-04-06 21:22:19 +03:00
AC_DEFINE([USE_BUILTIN_GRUB2_MKCONFIG], 1, [Define if using internal ostree-grub-generator]))
AC_ARG_WITH(grub2-mkconfig-path,
AS_HELP_STRING([--with-grub2-mkconfig-path],
[Path to grub2-mkconfig]))
AS_IF([test x$with_grub2_mkconfig_path = x], [
dnl Otherwise, look for the path to the system generator. On some
dnl distributions GRUB2 *-mkconfig executable has 'grub2' prefix and
dnl on some 'grub'. We default to grub2-mkconfig.
AC_CHECK_PROGS(GRUB2_MKCONFIG, [grub2-mkconfig grub-mkconfig], [grub2-mkconfig])
],[GRUB2_MKCONFIG=$with_grub2_mkconfig_path])
AC_DEFINE_UNQUOTED([GRUB2_MKCONFIG_PATH], ["$GRUB2_MKCONFIG"], [The system grub2-mkconfig executible name])
libostree: Add initial GRUB2 support In this approach, we drop a /etc/grub.d/15_ostree file which is a hybrid of shell/C that picks up bits from the GRUB2 library (e.g. the block device script generation), and then calls into libostree's GRUB2 code which knows about the BLS entries. This is admittedly ugly. There exists another approach for GRUB2 to learn the BLS specification. However, the spec has a few issues: https://www.redhat.com/archives/anaconda-devel-list/2014-July/msg00002.html This approach also gives a bit more control to the admin via the naming of the 15_ostree symlink; they can easily disable it: Or reorder the ostree entries ahead of 10_linux: Also, this approach doesn't require patches for grub2, which is an issue with the pressure to backport (rpm-)OSTree to EL7.
2014-10-11 16:59:06 +04:00
ostree-prepare-root: Allow building statically with musl If the `--with-static-compiler=musl-gcc` configure flag is given. ostree-prepare-root can be used as init in a system without a populated /lib. To support this use case we need to link statically as we will be unable to locate libc.so at run time if it's not installed in /lib. We support building ostree-prepare-root with a different compiler to the rest of ostree so we can use musl rather than glibc. This reduces the size of the executable significantly: from ~700K -> ~30K. We have to use `_SCRIPTS` here to get autotools to install this as an executable but without generating rules to make it itself which we have specified manually. See https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html for advice on using autotools in this manner. Closes: #477 Approved by: cgwalters
2016-08-30 22:28:02 +03:00
AC_ARG_WITH(static-compiler,
AS_HELP_STRING([--with-static-compiler],
[Use the given compiler to build ostree-prepare-root statically linked (default: no)]),,
[with_static_compiler=no])
AM_CONDITIONAL(BUILDOPT_USE_STATIC_COMPILER, test x$with_static_compiler != xno)
AC_SUBST(STATIC_COMPILER, $with_static_compiler)
Skip gjs-based tests if ASAN is enabled Unfortunately, introspection uses dlopen(), which doesn't quite work when the DSO is compiled with ASAN but the outer executable isn't. Trying to inject LD_PRELOAD=libasan means the outer executable has to be leak free...which, yeah, I'm not going to get into running ASAN today on gjs or pygobject. So, let's skip those tests - ideally, we still run them in some other context without the sanitizers. The coverage we have from them is middling anyways. Closes: #622 Approved by: jlebon
2016-12-08 05:59:40 +03:00
dnl for tests (but we can't use asan with gjs or any introspection,
dnl see https://github.com/google/sanitizers/wiki/AddressSanitizerAsDso for more info)
AS_IF([test "x$found_introspection" = xyes && test x$using_asan != xyes], [
build: Also make gjs-based tests conditional on introspection support Since they use imports.gi.OSTree.
2013-10-11 19:50:15 +04:00
AC_PATH_PROG(GJS, [gjs])
if test -n "$GJS"; then
have_gjs=yes
else
have_gjs=no
fi
], [have_gjs=no])
tests: Add a gjs-based test This covers introspection, and in general is a much better way to get API coverage tests.
2013-09-18 20:01:46 +04:00
AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
build: Add --enable-experimental-api configure option for unstable APIs There are currently no unstable APIs, but some will be added in following commits. They will be built and exposed in the libostree global symbol list iff configured with --enable-experimental-api. Distributions should not package OSTree with --enable-experimental-api. This is designed for previewing new APIs on controlled platforms; any of the APIs hidden behind this option may be changed or removed at any point. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #832 Approved by: cgwalters
2017-05-01 12:59:33 +03:00
# Do we enable building experimental (non-stable) API?
# The OSTREE_ENABLE_EXPERIMENTAL_API #define is used internally and in public
# headers, so any consumer of libostree who wants to use experimental API must
# #define OSTREE_ENABLE_EXPERIMENTAL_API 1
# before including libostree headers. This means the name in the AC_DEFINE below
# is public API.
AC_ARG_ENABLE([experimental-api],
[AS_HELP_STRING([--enable-experimental-api],
[Enable unstable experimental API in libostree [default=no]])],,
[enable_experimental_api=no])
AS_IF([test x$enable_experimental_api = xyes],
[AC_DEFINE([OSTREE_ENABLE_EXPERIMENTAL_API],[1],[Define if experimental API should be enabled])
OSTREE_FEATURES="$OSTREE_FEATURES experimental"]
)
AM_CONDITIONAL([ENABLE_EXPERIMENTAL_API],[test x$enable_experimental_api = xyes])
build-sys: Add "release build" flag, use for symbol versioning I was trying to do a release and move the symbols from `-devel.sym` into `-release.sym`, but it turns out that at least GNU binutils `ld` treats an empty version script as a syntax error. Fix this by adding a "release build" flag, and only include `-devel` in non-release builds. This would also make it easier to inject that flag into our `.pc` and `ostree-version.h` and `ostree --version` metadata, but I didn't do that yet. EDIT: Turns out a simpler fix is just to add an empty section. However I kept this commit since it's a useful sanity check for whether we should include `-devel.sym` in builds, and we may want to inject the metadata later. Closes: #942 Approved by: jlebon
2017-06-19 17:23:21 +03:00
AM_CONDITIONAL([BUILDOPT_IS_DEVEL_BUILD],[test x$is_release_build != xyes])
main: DevelBuild=yes to `ostree --version` for devel builds And use it in `test-symbols.sh`, to fix the `distcheck` case; the previous change stopped distributing `libostree-devel.sym` in release builds. Closes: #944 Approved by: jlebon
2017-06-19 18:23:45 +03:00
AM_COND_IF([BUILDOPT_IS_DEVEL_BUILD],
AC_DEFINE([BUILDOPT_IS_DEVEL_BUILD], [1], [Define if doing a development build])
release_build_type=devel,
release_build_type=release)
build: Add ‘devel’ or ‘release’ to OSTREE_FEATURES for test-symbols.sh test-symbols.sh was looking for the DevelBuild string, which is actually part of the output from `ostree --version`, not $OSTREE_FEATURES. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #948 Approved by: cgwalters
2017-06-20 19:38:15 +03:00
OSTREE_FEATURES="$OSTREE_FEATURES $release_build_type"
build: Add --enable-experimental-api configure option for unstable APIs There are currently no unstable APIs, but some will be added in following commits. They will be built and exposed in the libostree global symbol list iff configured with --enable-experimental-api. Distributions should not package OSTree with --enable-experimental-api. This is designed for previewing new APIs on controlled platforms; any of the APIs hidden behind this option may be changed or removed at any point. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #832 Approved by: cgwalters
2017-05-01 12:59:33 +03:00
Initial commit
2011-10-10 01:03:08 +04:00
AC_CONFIG_FILES([
Makefile
build: Rename doc/ -> apidoc/ This is preparation for introducing a `mkdocs` manual under `doc/` which should be significantly more useful for the world at large than the minimal manual that exists there now.
2016-01-27 21:29:21 +03:00
apidoc/Makefile
Install a shared library This required a fair bit of surgery because previously ostree.h included otutil.h, but that's supposed to be a private library.
2013-07-27 03:25:07 +04:00
src/libostree/ostree-1.pc
libostree: add versioning macros OSTree currently provides no way to inspect the versioning information at run time, being only available at compile time through pkg-config. This is a problem for e.g. Flatpak, that needs to check whether the 'update-frequency' option is available. Checking at compile time isn't great since it's not looking for new symbols, but only if an optional feature is present. This commit, then, adds a new header that is generated at compile time, exposing OSTree's versioning information. Closes: #728 Approved by: cgwalters
2017-03-10 20:33:52 +03:00
src/libostree/ostree-version.h
Initial commit
2011-10-10 01:03:08 +04:00
])
AC_OUTPUT
build: Note the status of libsoup-gnome and libarchive So fewer people accidentally compile without one.
2012-02-25 00:40:52 +04:00
echo "
docs/build: s/libOSTree/libostree/ I find "libOSTree" awkward to type and really to look at. Let's be nicer on people's pinky fingers and eyes and drop it all down to lowercase. Closes: #1093 Approved by: jlebon
2017-08-18 18:04:58 +03:00
libostree $VERSION ($release_build_type)
build: Note the status of libsoup-gnome and libarchive So fewer people accidentally compile without one.
2012-02-25 00:40:52 +04:00
===============
build: Fix and prettify build option output The documentation one was broken by the gtk-doc changes, and let's align things.
2013-08-17 23:21:31 +04:00
introspection: $found_introspection
oxidation: Add implementation of bupsplit in Rust This is an initial drop of "oxidation", or adding implementation of components in Rust. The bupsplit code is a good target - no dependencies, just computation. Translation into Rust had a few twists - - The C code relies a lot on overflowing unsigned ints, and also on the C promotion rules for e.g. `uint8_t -> int32_t` - There were some odd loops that I introduced bugs in while translating...in particular, the function always returns `len`, but I mistakenly translated to `len+1`, resulting in an OOB read on the C side, which was hard to debug. On the plus side, an off-by-one array indexing in the Rust code paniced nicely. In practice, we'll need a lot more build infrastructure to make this work, such as using `cargo vendor` when producing build artifacts for example. Also, Cargo is yet another thing we need to cache. Where do we go with this? Well, I think we should merge this, it's not a lot of code. We can just have it be an alternative CI target. Should we do a lot more right now? Probably not immediately, but I find the medium/long term prospects pretty exciting! Closes: #656 Approved by: jlebon
2017-01-25 05:43:53 +03:00
Rust (internal oxidation): $rust_debug_release
Import rofiles-fuse While it's not strictly tied to OSTree, let's move https://github.com/cgwalters/rofiles-fuse in here because: - It's *very* useful in concert with OSTree - It's tiny - We can reuse OSTree's test, documentation, etc. infrastructure One thing to consider also is that at some point we could experiment with writing a FUSE filesystem for OSTree. This could internalize a better equivalent of `--link-checkout-speedup`, but on the other hand, the cost of walking filesystem trees for these types of operations is really quite small. But if we did decide to do more FUSE things in OSTree, this is a step towards that too.
2016-02-10 14:42:54 +03:00
rofiles-fuse: $enable_rofiles_fuse
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
HTTP backend: $fetcher_backend
Disable "ostree trivial-httpd" by default now This goes farther along the path of deprecating it; consumers should have been ported at this point. Though probably a lot of people may still use `rpm-ostree-toolbox`. Closes: #723 Approved by: jlebon
2017-03-08 01:32:50 +03:00
\"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
Add SELinux support The trees as shipped come with /usr/etc, which should just be labeled as usr_t. When we do a deployment, we need to relabel the copies of the files we're making in /etc. SELinux support is compile and runtime optional.
2014-01-29 18:22:16 +04:00
SELinux: $with_selinux
build: Various fixes for openssl build This actually worked before because `pkg-config --cflags openssl` is empty, and the linker was satisfying `-lssl -lcrypto` from our indirect dependencies. Also, in fact we *currently* just want `pkg-config libcrypto` i.e. `-lcrypto`, since we aren't actually using openssl to speak TLS. This doesn't actually matter on Fedora at least since they're both in the `openssl-libs` package, but they are separate for a reason. Closes: #749 Approved by: jlebon
2017-03-21 22:07:41 +03:00
OpenSSL libcrypto (checksums): $with_openssl
lib: Use sd_journal directly (optionally) This was the last caller of libgsystem that isn't `gs_file_get_path_cached()`. I think the use case ostree has where the same code can be called via command line and via a shared library *and* via a daemon is rather unusual, so let's just copy the code for logging from libgsystem into here. For example rpm-ostree hard depends on a daemon mode, so it'll just use `sd_journal` directly. Closes: #341 Approved by: jlebon
2016-06-14 20:12:21 +03:00
systemd: $have_libsystemd
deploy: Handle a read-only /boot I'd like to encourage people to make OSTree-managed systems more strictly read-only in multiple places. Ideally everywhere is read-only normally besides `/var/`, `/tmp/`, and `/run`. `/boot` is a good example of something to make readonly. Particularly now that there's work on the `admin unlock` verb, we need to protect the system better against things like `rpm -Uvh kernel.rpm` because the RPM-packaged kernel won't understand how to do OSTree right. In order to make this work of course, we *do* need to remount `/boot` as writable when we're doing an upgrade that changes the kernel configuration. So the strategy is to detect whether it's read-only, and if so, temporarily mount read-write, then remount read-only when the upgrade is done. We can generalize this in the future to also do `/etc` (and possibly `/sysroot/ostree/` although that gets tricky). One detail: In order to detect "is this path a mountpoint" is nontrivial - I looked at copying the systemd code, but the right place is to use `libmount` anyways.
2016-03-21 17:37:38 +03:00
libmount: $with_libmount
build: Fix and prettify build option output The documentation one was broken by the gtk-doc changes, and let's align things.
2013-08-17 23:21:31 +04:00
libarchive (parse tar files directly): $with_libarchive
build: Remove --disable-static-deltas option I'm confident now we can declare them stable.
2016-01-27 19:06:30 +03:00
static deltas: yes (always enabled now)
Update libglnx for O_TMPFILE build time option See: https://github.com/ostreedev/ostree/issues/421 Closes: #426 Approved by: gatispaeglis
2016-08-03 20:16:30 +03:00
O_TMPFILE: $enable_otmpfile
libglnx: Update to latest This pulls in a new compilation flag for wrpseudo compatibility. Also note we need to add some includes since glnx-libcontainer went away, and with it some includes for `sys/mount.h` etc. Closes: #522 Approved by: cgwalters
2016-10-05 17:13:33 +03:00
wrpseudo-compat: $enable_wrpseudo_compat
build: Add --disable-man Gnome Continuous doesn't have docbook, so copy what we do for glib.
2016-01-28 23:22:10 +03:00
man pages (xsltproc): $enable_man
build: Rename doc/ -> apidoc/ This is preparation for introducing a `mkdocs` manual under `doc/` which should be significantly more useful for the world at large than the minimal manual that exists there now.
2016-01-27 21:29:21 +03:00
api docs (gtk-doc): $enable_gtk_doc
Add --enable-installed-tests=exclusive, fix installed case The major reason to do this is that running tests *both* installed and uninstalled in our CI is a mostly pointless waste of time. Particularly given we have a few expensive tests. We *do* have tests that only run uninstalled (since they require the source code) like `test-symbols.sh`. Hence, add `--enable-installed-tests=exclusive` to mean *only* do installed for most tests. We'll still have uninstalled coverage via the Travis/Debian configs, and we could perhaps do another build with a subset of uninstalled tests, but I'm not really concerned about it. I'd like to do a renewed push for the InstalledTests model since I feel it's just fundamentally better. (`g-d-t-r` kind of sucks, but then so does the automake runner). Also while we're here - fix the CI to use the correct context, which started this mess. Closes: #837 Approved by: dbnicholson
2017-05-08 17:44:43 +03:00
installed tests: $enable_installed_tests
tests: Add a gjs-based test This covers introspection, and in general is a much better way to get API coverage tests.
2013-09-18 20:01:46 +04:00
gjs-based tests: $have_gjs
Add support for mkinitcpio https://bugzilla.gnome.org/show_bug.cgi?id=710682
2013-10-23 00:04:32 +04:00
dracut: $with_dracut
ostree-prepare-root: Allow building statically with musl If the `--with-static-compiler=musl-gcc` configure flag is given. ostree-prepare-root can be used as init in a system without a populated /lib. To support this use case we need to link statically as we will be unable to locate libc.so at run time if it's not installed in /lib. We support building ostree-prepare-root with a different compiler to the rest of ostree so we can use musl rather than glibc. This reduces the size of the executable significantly: from ~700K -> ~30K. We have to use `_SCRIPTS` here to get autotools to install this as an executable but without generating rules to make it itself which we have specified manually. See https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html for advice on using autotools in this manner. Closes: #477 Approved by: cgwalters
2016-08-30 22:28:02 +03:00
mkinitcpio: $with_mkinitcpio
build: Add --enable-experimental-api configure option for unstable APIs There are currently no unstable APIs, but some will be added in following commits. They will be built and exposed in the libostree global symbol list iff configured with --enable-experimental-api. Distributions should not package OSTree with --enable-experimental-api. This is designed for previewing new APIs on controlled platforms; any of the APIs hidden behind this option may be changed or removed at any point. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #832 Approved by: cgwalters
2017-05-01 12:59:33 +03:00
Static compiler for ostree-prepare-root: $with_static_compiler
Experimental API $enable_experimental_api"
build: Find grub2-mkconfig a bit more automagically If one happens to not have grub2 installed, the previous commit would cause us to fall back to `grub-mkconfig` with bad results. We should likely just do dynamic detection and avoid pain, but there's no harm in also allowing this to be statically determined. The automagic here is that if `/etc/os-release` says `ID_LIKE=fedora`, we know to use `grub2-mkconfig`. But distro scripts should set this in the build configurations using `--with-grub2-mkconfig=`. Closes: #240 Approved by: jlebon
2016-04-06 21:22:19 +03:00
AS_IF([test x$with_builtin_grub2_mkconfig = xyes], [
echo " builtin grub2-mkconfig (instead of system): $with_builtin_grub2_mkconfig"
], [
echo " grub2-mkconfig path: $GRUB2_MKCONFIG"
])
Install systemd units in the right location Debian uses /lib/systemd/system for system unit files, while i'm putting ostree under the /usr prefix which means the hardcoded path fails. Leave it to configure to work out the right location for systemd units (method copied from pollkit). Furthermore instead of installing the unit in local-fs.target.wants by hand add a [Install] section so systemctl enable does the right thing https://bugzilla.gnome.org/show_bug.cgi?id=705864
2013-08-12 21:27:27 +04:00
echo ""
Reference in New Issue Copy Permalink