diff --git a/Makefile-libostree-defines.am b/Makefile-libostree-defines.am index 43e09281..4d290a88 100644 --- a/Makefile-libostree-defines.am +++ b/Makefile-libostree-defines.am @@ -28,6 +28,7 @@ libostree_public_headers = \ src/libostree/ostree-dummy-enumtypes.h \ src/libostree/ostree-mutable-tree.h \ src/libostree/ostree-repo.h \ + src/libostree/ostree-repo-os.h \ src/libostree/ostree-types.h \ src/libostree/ostree-repo-file.h \ src/libostree/ostree-diff.h \ diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 02dbaded..ce784aff 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -21,18 +21,9 @@ include Makefile-libostree-defines.am - -if ENABLE_RUST -bupsplitpath = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/libbupsplit_rs.a -BUPSPLIT_RUST_SRCS = rust/src/bupsplit.rs -EXTRA_DIST += $(BUPSPLIT_RUST_SRCS) -$(bupsplitpath): Makefile $(BUPSPLIT_RUST_SRCS) - cd $(top_srcdir)/rust && CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build --verbose $(CARGO_RELEASE_ARGS) -else bupsplitpath = libbupsplit.la noinst_LTLIBRARIES += libbupsplit.la libbupsplit_la_SOURCES = src/libostree/bupsplit.h src/libostree/bupsplit.c -endif # ENABLE_RUST lib_LTLIBRARIES += libostree-1.la @@ -92,6 +83,7 @@ libostree_1_la_SOURCES = \ src/libostree/ostree-ref.c \ src/libostree/ostree-remote.c \ src/libostree/ostree-remote-private.h \ + src/libostree/ostree-repo-os.c \ src/libostree/ostree-repo.c \ src/libostree/ostree-repo-checkout.c \ src/libostree/ostree-repo-commit.c \ @@ -101,6 +93,7 @@ libostree_1_la_SOURCES = \ src/libostree/ostree-repo-libarchive.c \ src/libostree/ostree-repo-prune.c \ src/libostree/ostree-repo-refs.c \ + src/libostree/ostree-repo-verity.c \ src/libostree/ostree-repo-traverse.c \ src/libostree/ostree-repo-private.h \ src/libostree/ostree-repo-file.c \ @@ -185,7 +178,7 @@ endif # USE_GPGME symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym -## Uncomment this include when adding new development symbols. +# Uncomment this include when adding new development symbols. #if BUILDOPT_IS_DEVEL_BUILD #symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym #endif @@ -204,9 +197,6 @@ libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions $(addprefix libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \ $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) $(OT_DEP_CRYPTO_LIBS) # Some change between rust-1.21.0-1.fc27 and rust-1.22.1-1.fc27.x86_64 -if ENABLE_RUST -libostree_1_la_LIBADD += -ldl -endif libostree_1_la_LIBADD += $(bupsplitpath) EXTRA_libostree_1_la_DEPENDENCIES = $(symbol_files) diff --git a/Makefile.am b/Makefile.am index 87a705cc..b2588ad7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,30 +71,6 @@ GIRS = TYPELIBS = $(GIRS:.gir=.typelib) endif -# These bits based on gnome:librsvg/Makefile.am -if ENABLE_RUST -if RUST_DEBUG -CARGO_RELEASE_ARGS= -else -CARGO_RELEASE_ARGS=--release -endif - -check-local: - cd $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo test - -clean-local: - cd $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo clean - -dist-hook: - (cd $(distdir)/rust && \ - cp $(abs_top_srcdir)/rust/Cargo.lock . && \ - cargo vendor -q && \ - mkdir .cargo && \ - cp cargo-vendor-config .cargo/config) - -EXTRA_DIST += $(srcdir)/rust/Cargo.toml $(srcdir)/rust/cargo-vendor-config -endif # end ENABLE_RUST - libglnx_srcpath := $(srcdir)/libglnx libglnx_cflags := $(OT_DEP_GIO_UNIX_CFLAGS) "-I$(libglnx_srcpath)" libglnx_libs := $(OT_DEP_GIO_UNIX_LIBS) diff --git a/Makefile.in b/Makefile.in index cf4fbbeb..8673c858 100644 --- a/Makefile.in +++ b/Makefile.in @@ -416,53 +416,48 @@ check_PROGRAMS = $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) @ENABLE_INSTALLED_TESTS_TRUE@am__append_12 = $(test_ltlibraries) $(installed_test_ltlibraries) @ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(installed_test_meta_DATA) @ENABLE_GTK_DOC_TRUE@am__append_14 = apidoc -@ENABLE_RUST_TRUE@am__append_15 = $(srcdir)/rust/Cargo.toml $(srcdir)/rust/cargo-vendor-config -@USE_GPGME_TRUE@am__append_16 = \ +@USE_GPGME_TRUE@am__append_15 = \ @USE_GPGME_TRUE@ src/libotutil/ot-gpg-utils.c \ @USE_GPGME_TRUE@ src/libotutil/ot-gpg-utils.h \ @USE_GPGME_TRUE@ $(NULL) -@ENABLE_RUST_TRUE@am__append_17 = $(BUPSPLIT_RUST_SRCS) -@ENABLE_RUST_FALSE@am__append_18 = libbupsplit.la -@USE_LIBARCHIVE_TRUE@am__append_19 = src/libostree/ostree-libarchive-input-stream.h \ +@USE_LIBARCHIVE_TRUE@am__append_16 = src/libostree/ostree-libarchive-input-stream.h \ @USE_LIBARCHIVE_TRUE@ src/libostree/ostree-libarchive-input-stream.c \ @USE_LIBARCHIVE_TRUE@ src/libostree/ostree-libarchive-private.h \ @USE_LIBARCHIVE_TRUE@ $(NULL) -@HAVE_LIBSOUP_CLIENT_CERTS_TRUE@am__append_20 = \ +@HAVE_LIBSOUP_CLIENT_CERTS_TRUE@am__append_17 = \ @HAVE_LIBSOUP_CLIENT_CERTS_TRUE@ src/libostree/ostree-tls-cert-interaction.c \ @HAVE_LIBSOUP_CLIENT_CERTS_TRUE@ src/libostree/ostree-tls-cert-interaction.h \ @HAVE_LIBSOUP_CLIENT_CERTS_TRUE@ $(NULL) -@ENABLE_EXPERIMENTAL_API_FALSE@am__append_21 = $(libostree_experimental_headers) -@ENABLE_EXPERIMENTAL_API_TRUE@am__append_22 = \ +@ENABLE_EXPERIMENTAL_API_FALSE@am__append_18 = $(libostree_experimental_headers) +@ENABLE_EXPERIMENTAL_API_TRUE@am__append_19 = \ @ENABLE_EXPERIMENTAL_API_TRUE@ $(NULL) -@USE_AVAHI_TRUE@am__append_23 = \ +@USE_AVAHI_TRUE@am__append_20 = \ @USE_AVAHI_TRUE@ src/libostree/ostree-repo-finder-avahi-parser.c \ @USE_AVAHI_TRUE@ src/libostree/ostree-repo-finder-avahi-private.h \ @USE_AVAHI_TRUE@ $(NULL) -@USE_GPGME_TRUE@am__append_24 = \ +@USE_GPGME_TRUE@am__append_21 = \ @USE_GPGME_TRUE@ src/libostree/ostree-gpg-verifier.c \ @USE_GPGME_TRUE@ src/libostree/ostree-gpg-verifier.h \ @USE_GPGME_TRUE@ src/libostree/ostree-gpg-verify-result.c \ @USE_GPGME_TRUE@ src/libostree/ostree-gpg-verify-result-private.h \ @USE_GPGME_TRUE@ $(NULL) -@USE_GPGME_FALSE@am__append_25 = \ +@USE_GPGME_FALSE@am__append_22 = \ @USE_GPGME_FALSE@ src/libostree/ostree-gpg-verify-result-dummy.c \ @USE_GPGME_FALSE@ $(NULL) -# Some change between rust-1.21.0-1.fc27 and rust-1.22.1-1.fc27.x86_64 -@ENABLE_RUST_TRUE@am__append_26 = -ldl -@USE_LIBARCHIVE_TRUE@am__append_27 = $(OT_DEP_LIBARCHIVE_CFLAGS) -@USE_LIBARCHIVE_TRUE@am__append_28 = $(OT_DEP_LIBARCHIVE_LIBS) -@USE_AVAHI_TRUE@am__append_29 = $(OT_DEP_AVAHI_CFLAGS) -@USE_AVAHI_TRUE@am__append_30 = $(OT_DEP_AVAHI_LIBS) -@BUILDOPT_SYSTEMD_TRUE@am__append_31 = $(LIBSYSTEMD_CFLAGS) -@BUILDOPT_SYSTEMD_TRUE@am__append_32 = $(LIBSYSTEMD_LIBS) -@USE_CURL_OR_SOUP_TRUE@am__append_33 = \ +@USE_LIBARCHIVE_TRUE@am__append_23 = $(OT_DEP_LIBARCHIVE_CFLAGS) +@USE_LIBARCHIVE_TRUE@am__append_24 = $(OT_DEP_LIBARCHIVE_LIBS) +@USE_AVAHI_TRUE@am__append_25 = $(OT_DEP_AVAHI_CFLAGS) +@USE_AVAHI_TRUE@am__append_26 = $(OT_DEP_AVAHI_LIBS) +@BUILDOPT_SYSTEMD_TRUE@am__append_27 = $(LIBSYSTEMD_CFLAGS) +@BUILDOPT_SYSTEMD_TRUE@am__append_28 = $(LIBSYSTEMD_LIBS) +@USE_CURL_OR_SOUP_TRUE@am__append_29 = \ @USE_CURL_OR_SOUP_TRUE@ src/libostree/ostree-fetcher.h \ @USE_CURL_OR_SOUP_TRUE@ src/libostree/ostree-fetcher-util.h \ @USE_CURL_OR_SOUP_TRUE@ src/libostree/ostree-fetcher-util.c \ @@ -471,45 +466,45 @@ check_PROGRAMS = $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) @USE_CURL_OR_SOUP_TRUE@ src/libostree/ostree-metalink.c \ @USE_CURL_OR_SOUP_TRUE@ $(NULL) -@USE_CURL_TRUE@am__append_34 = src/libostree/ostree-fetcher-curl.c \ +@USE_CURL_TRUE@am__append_30 = src/libostree/ostree-fetcher-curl.c \ @USE_CURL_TRUE@ src/libostree/ostree-soup-uri.h src/libostree/ostree-soup-uri.c \ @USE_CURL_TRUE@ src/libostree/ostree-soup-form.c \ @USE_CURL_TRUE@ $(NULL) -@USE_CURL_TRUE@am__append_35 = $(OT_DEP_CURL_CFLAGS) -@USE_CURL_TRUE@am__append_36 = $(OT_DEP_CURL_LIBS) -@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_37 = src/libostree/ostree-fetcher-soup.c -@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_38 = $(OT_INTERNAL_SOUP_CFLAGS) -@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_39 = $(OT_INTERNAL_SOUP_LIBS) -@USE_AVAHI_TRUE@@USE_CURL_FALSE@@USE_LIBSOUP_FALSE@am__append_40 = src/libostree/ostree-soup-uri.h \ +@USE_CURL_TRUE@am__append_31 = $(OT_DEP_CURL_CFLAGS) +@USE_CURL_TRUE@am__append_32 = $(OT_DEP_CURL_LIBS) +@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_33 = src/libostree/ostree-fetcher-soup.c +@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_34 = $(OT_INTERNAL_SOUP_CFLAGS) +@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_35 = $(OT_INTERNAL_SOUP_LIBS) +@USE_AVAHI_TRUE@@USE_CURL_FALSE@@USE_LIBSOUP_FALSE@am__append_36 = src/libostree/ostree-soup-uri.h \ @USE_AVAHI_TRUE@@USE_CURL_FALSE@@USE_LIBSOUP_FALSE@ src/libostree/ostree-soup-uri.c \ @USE_AVAHI_TRUE@@USE_CURL_FALSE@@USE_LIBSOUP_FALSE@ src/libostree/ostree-soup-form.c \ @USE_AVAHI_TRUE@@USE_CURL_FALSE@@USE_LIBSOUP_FALSE@ $(NULL) -@USE_LIBMOUNT_TRUE@am__append_41 = $(OT_DEP_LIBMOUNT_CFLAGS) -@USE_LIBMOUNT_TRUE@am__append_42 = $(OT_DEP_LIBMOUNT_LIBS) -@USE_SELINUX_TRUE@am__append_43 = $(OT_DEP_SELINUX_CFLAGS) -@USE_SELINUX_TRUE@am__append_44 = $(OT_DEP_SELINUX_LIBS) -@USE_LIBSODIUM_TRUE@am__append_45 = $(OT_DEP_LIBSODIUM_CFLAGS) -@USE_LIBSODIUM_TRUE@am__append_46 = $(OT_DEP_LIBSODIUM_LIBS) +@USE_LIBMOUNT_TRUE@am__append_37 = $(OT_DEP_LIBMOUNT_CFLAGS) +@USE_LIBMOUNT_TRUE@am__append_38 = $(OT_DEP_LIBMOUNT_LIBS) +@USE_SELINUX_TRUE@am__append_39 = $(OT_DEP_SELINUX_CFLAGS) +@USE_SELINUX_TRUE@am__append_40 = $(OT_DEP_SELINUX_LIBS) +@USE_LIBSODIUM_TRUE@am__append_41 = $(OT_DEP_LIBSODIUM_CFLAGS) +@USE_LIBSODIUM_TRUE@am__append_42 = $(OT_DEP_LIBSODIUM_LIBS) # When compiling this is set via config.h, but g-ir-scanner can't use that -@BUILDOPT_INTROSPECTION_TRUE@@ENABLE_EXPERIMENTAL_API_TRUE@am__append_47 = -DOSTREE_ENABLE_EXPERIMENTAL_API=1 -@BUILDOPT_INTROSPECTION_TRUE@am__append_48 = OSTree-1.0.gir -@BUILDOPT_INTROSPECTION_TRUE@am__append_49 = OSTree-1.0.gir -@BUILDOPT_INTROSPECTION_TRUE@am__append_50 = OSTree-1.0.typelib -@BUILDOPT_INTROSPECTION_TRUE@am__append_51 = $(gir_DATA) $(typelib_DATA) -@ENABLE_EXPERIMENTAL_API_TRUE@am__append_52 = \ +@BUILDOPT_INTROSPECTION_TRUE@@ENABLE_EXPERIMENTAL_API_TRUE@am__append_43 = -DOSTREE_ENABLE_EXPERIMENTAL_API=1 +@BUILDOPT_INTROSPECTION_TRUE@am__append_44 = OSTree-1.0.gir +@BUILDOPT_INTROSPECTION_TRUE@am__append_45 = OSTree-1.0.gir +@BUILDOPT_INTROSPECTION_TRUE@am__append_46 = OSTree-1.0.typelib +@BUILDOPT_INTROSPECTION_TRUE@am__append_47 = $(gir_DATA) $(typelib_DATA) +@ENABLE_EXPERIMENTAL_API_TRUE@am__append_48 = \ @ENABLE_EXPERIMENTAL_API_TRUE@ $(NULL) -@USE_GPGME_TRUE@am__append_53 = \ +@USE_GPGME_TRUE@am__append_49 = \ @USE_GPGME_TRUE@ src/ostree/ot-builtin-gpg-sign.c \ @USE_GPGME_TRUE@ $(NULL) -@USE_GPGME_TRUE@am__append_54 = \ +@USE_GPGME_TRUE@am__append_50 = \ @USE_GPGME_TRUE@ src/ostree/ot-remote-builtin-gpg-import.c \ @USE_GPGME_TRUE@ $(NULL) -@USE_CURL_OR_SOUP_TRUE@am__append_55 = src/ostree/ot-remote-builtin-add-cookie.c \ +@USE_CURL_OR_SOUP_TRUE@am__append_51 = src/ostree/ot-remote-builtin-add-cookie.c \ @USE_CURL_OR_SOUP_TRUE@ src/ostree/ot-remote-builtin-delete-cookie.c \ @USE_CURL_OR_SOUP_TRUE@ src/ostree/ot-remote-builtin-list-cookies.c \ @USE_CURL_OR_SOUP_TRUE@ src/ostree/ot-remote-cookie-util.h \ @@ -517,20 +512,20 @@ check_PROGRAMS = $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) @USE_CURL_OR_SOUP_TRUE@ $(NULL) src/ostree/ot-builtin-pull.c # Eventually once we stop things from using this, we should support disabling this -@USE_LIBSOUP_TRUE@am__append_56 = src/ostree/ot-builtin-trivial-httpd.c -@USE_LIBSOUP_TRUE@am__append_57 = ostree-trivial-httpd +@USE_LIBSOUP_TRUE@am__append_52 = src/ostree/ot-builtin-trivial-httpd.c +@USE_LIBSOUP_TRUE@am__append_53 = ostree-trivial-httpd # This is necessary for the cookie jar bits -@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_58 = $(OT_INTERNAL_SOUP_CFLAGS) -@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_59 = $(OT_INTERNAL_SOUP_LIBS) -@USE_LIBARCHIVE_TRUE@am__append_60 = $(OT_DEP_LIBARCHIVE_CFLAGS) -@USE_LIBARCHIVE_TRUE@am__append_61 = $(OT_DEP_LIBARCHIVE_LIBS) -@USE_LIBSODIUM_TRUE@am__append_62 = $(OT_DEP_LIBSODIUM_CFLAGS) -@USE_LIBSODIUM_TRUE@am__append_63 = $(OT_DEP_LIBSODIUM_LIBS) -@BUILDOPT_SYSTEMD_TRUE@am__append_64 = ostree-remount +@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_54 = $(OT_INTERNAL_SOUP_CFLAGS) +@USE_CURL_FALSE@@USE_LIBSOUP_TRUE@am__append_55 = $(OT_INTERNAL_SOUP_LIBS) +@USE_LIBARCHIVE_TRUE@am__append_56 = $(OT_DEP_LIBARCHIVE_CFLAGS) +@USE_LIBARCHIVE_TRUE@am__append_57 = $(OT_DEP_LIBARCHIVE_LIBS) +@USE_LIBSODIUM_TRUE@am__append_58 = $(OT_DEP_LIBSODIUM_CFLAGS) +@USE_LIBSODIUM_TRUE@am__append_59 = $(OT_DEP_LIBSODIUM_LIBS) +@BUILDOPT_SYSTEMD_TRUE@am__append_60 = ostree-remount # It is built anyway as a side-effect of having the symlink in tests/, # and if we declare it here, it gets cleaned up properly -@BUILDOPT_SYSTEMD_FALSE@am__append_65 = ostree-remount +@BUILDOPT_SYSTEMD_FALSE@am__append_61 = ostree-remount # 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 @@ -542,66 +537,66 @@ check_PROGRAMS = $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) # 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 -@BUILDOPT_USE_STATIC_COMPILER_TRUE@am__append_66 = ostree-prepare-root -@BUILDOPT_USE_STATIC_COMPILER_FALSE@am__append_67 = ostree-prepare-root -@BUILDOPT_SYSTEMD_TRUE@am__append_68 = -DHAVE_SYSTEMD=1 +@BUILDOPT_USE_STATIC_COMPILER_TRUE@am__append_62 = ostree-prepare-root +@BUILDOPT_USE_STATIC_COMPILER_FALSE@am__append_63 = ostree-prepare-root +@BUILDOPT_SYSTEMD_TRUE@am__append_64 = -DHAVE_SYSTEMD=1 # This is the "new mode" of using a generator for /var; see # https://github.com/ostreedev/ostree/issues/855 -@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_69 = -DHAVE_SYSTEMD_AND_LIBMOUNT=1 -@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_70 = -DHAVE_SYSTEMD_AND_LIBMOUNT=1 +@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_65 = -DHAVE_SYSTEMD_AND_LIBMOUNT=1 +@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_66 = -DHAVE_SYSTEMD_AND_LIBMOUNT=1 @BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@systemdsystemgenerator_PROGRAMS = ostree-system-generator$(EXEEXT) -@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_71 = $(systemdsystemgenerator_PROGRAMS) +@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_67 = $(systemdsystemgenerator_PROGRAMS) # Allow the distcheck install under $prefix test to pass -@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_72 = --with-systemdsystemgeneratordir='$${libdir}/systemd/system-generators' -@BUILDOPT_FUSE_TRUE@am__append_73 = rofiles-fuse -@BUILDOPT_ASAN_TRUE@am__append_74 = OT_SKIP_READDIR_RAND=1 G_SLICE=always-malloc -@USE_GPGME_TRUE@am__append_75 = \ +@BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@am__append_68 = --with-systemdsystemgeneratordir='$${libdir}/systemd/system-generators' +@BUILDOPT_FUSE_TRUE@am__append_69 = rofiles-fuse +@BUILDOPT_ASAN_TRUE@am__append_70 = OT_SKIP_READDIR_RAND=1 G_SLICE=always-malloc +@USE_GPGME_TRUE@am__append_71 = \ @USE_GPGME_TRUE@ tests/test-remote-gpg-import.sh \ @USE_GPGME_TRUE@ tests/test-gpg-signed-commit.sh \ @USE_GPGME_TRUE@ tests/test-admin-gpg.sh \ @USE_GPGME_TRUE@ $(NULL) -@ENABLE_EXPERIMENTAL_API_TRUE@am__append_76 = $(experimental_test_scripts) -@ENABLE_EXPERIMENTAL_API_FALSE@am__append_77 = $(experimental_test_scripts) -@BUILDOPT_FUSE_TRUE@am__append_78 = tests/test-rofiles-fuse.sh -@BUILDOPT_FUSE_TRUE@am__append_79 = tests/rofiles-fuse-symlink-stamp -@BUILDOPT_FUSE_FALSE@am__append_80 = tests/test-rofiles-fuse.sh -@USE_LIBSOUP_TRUE@am__append_81 = tests/test-remote-cookies.sh -@BUILDOPT_GJS_TRUE@am__append_82 = $(js_tests) $(js_installed_tests) -@BUILDOPT_GJS_FALSE@am__append_83 = $(js_tests) -@BUILDOPT_GJS_FALSE@am__append_84 = $(js_installed_tests) -@ENABLE_INSTALLED_TESTS_FALSE@am__append_85 = -rpath $(abs_builddir) -@USE_GPGME_TRUE@am__append_86 = \ +@ENABLE_EXPERIMENTAL_API_TRUE@am__append_72 = $(experimental_test_scripts) +@ENABLE_EXPERIMENTAL_API_FALSE@am__append_73 = $(experimental_test_scripts) +@BUILDOPT_FUSE_TRUE@am__append_74 = tests/test-rofiles-fuse.sh +@BUILDOPT_FUSE_TRUE@am__append_75 = tests/rofiles-fuse-symlink-stamp +@BUILDOPT_FUSE_FALSE@am__append_76 = tests/test-rofiles-fuse.sh +@USE_LIBSOUP_TRUE@am__append_77 = tests/test-remote-cookies.sh +@BUILDOPT_GJS_TRUE@am__append_78 = $(js_tests) $(js_installed_tests) +@BUILDOPT_GJS_FALSE@am__append_79 = $(js_tests) +@BUILDOPT_GJS_FALSE@am__append_80 = $(js_installed_tests) +@ENABLE_INSTALLED_TESTS_FALSE@am__append_81 = -rpath $(abs_builddir) +@USE_GPGME_TRUE@am__append_82 = \ @USE_GPGME_TRUE@ tests/test-gpg-verify-result \ @USE_GPGME_TRUE@ $(NULL) -@USE_AVAHI_TRUE@am__append_87 = tests/test-repo-finder-avahi -@USE_LIBARCHIVE_TRUE@am__append_88 = tests/test-libarchive-import -@USE_GPGME_TRUE@am__append_89 = \ +@USE_AVAHI_TRUE@am__append_83 = tests/test-repo-finder-avahi +@USE_LIBARCHIVE_TRUE@am__append_84 = tests/test-libarchive-import +@USE_GPGME_TRUE@am__append_85 = \ @USE_GPGME_TRUE@ tests/gpg-verify-data/README.md \ @USE_GPGME_TRUE@ $(NULL) -@ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@am__append_90 = $(_installed_or_uninstalled_test_scripts) -@ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@am__append_91 = $(_installed_or_uninstalled_test_programs) -@ENABLE_INSTALLED_TESTS_TRUE@am__append_92 = install-installed-tests-extra +@ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@am__append_86 = $(_installed_or_uninstalled_test_scripts) +@ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@am__append_87 = $(_installed_or_uninstalled_test_programs) +@ENABLE_INSTALLED_TESTS_TRUE@am__append_88 = install-installed-tests-extra # Allow the distcheck install under $prefix test to pass -@BUILDOPT_SYSTEMD_TRUE@am__append_93 = --with-systemdsystemunitdir='$${libdir}/systemd/system' +@BUILDOPT_SYSTEMD_TRUE@am__append_89 = --with-systemdsystemunitdir='$${libdir}/systemd/system' # We're using the system grub2-mkconfig generator -@BUILDOPT_BUILTIN_GRUB2_MKCONFIG_FALSE@am__append_94 = src/boot/grub2/grub2-15_ostree -@BUILDOPT_BUILTIN_GRUB2_MKCONFIG_FALSE@am__append_95 = install-grub2-config-hook +@BUILDOPT_BUILTIN_GRUB2_MKCONFIG_FALSE@am__append_90 = src/boot/grub2/grub2-15_ostree +@BUILDOPT_BUILTIN_GRUB2_MKCONFIG_FALSE@am__append_91 = install-grub2-config-hook # We're using our internal generator -@BUILDOPT_BUILTIN_GRUB2_MKCONFIG_TRUE@am__append_96 = src/boot/grub2/ostree-grub-generator -@ENABLE_MAN_TRUE@@USE_LIBSOUP_TRUE@am__append_97 = ostree-trivial-httpd.1 +@BUILDOPT_BUILTIN_GRUB2_MKCONFIG_TRUE@am__append_92 = src/boot/grub2/ostree-grub-generator +@ENABLE_MAN_TRUE@@USE_LIBSOUP_TRUE@am__append_93 = ostree-trivial-httpd.1 # We still want to distribute the source, even if we are not building it -@ENABLE_MAN_TRUE@@USE_LIBSOUP_FALSE@am__append_98 = man/ostree-trivial-httpd.xml -@BUILDOPT_FUSE_TRUE@@ENABLE_MAN_TRUE@am__append_99 = rofiles-fuse.1 -@ENABLE_MAN_TRUE@@USE_GPGME_TRUE@am__append_100 = ostree-gpg-sign.1 -@ENABLE_MAN_TRUE@am__append_101 = $(man1_MANS:.1=.xml) $(man5_MANS:.5=.xml) -@ENABLE_MAN_TRUE@am__append_102 = \ +@ENABLE_MAN_TRUE@@USE_LIBSOUP_FALSE@am__append_94 = man/ostree-trivial-httpd.xml +@BUILDOPT_FUSE_TRUE@@ENABLE_MAN_TRUE@am__append_95 = rofiles-fuse.1 +@ENABLE_MAN_TRUE@@USE_GPGME_TRUE@am__append_96 = ostree-gpg-sign.1 +@ENABLE_MAN_TRUE@am__append_97 = $(man1_MANS:.1=.xml) $(man5_MANS:.5=.xml) +@ENABLE_MAN_TRUE@am__append_98 = \ @ENABLE_MAN_TRUE@ $(man1_MANS) \ @ENABLE_MAN_TRUE@ $(man5_MANS) \ @ENABLE_MAN_TRUE@ $(NULL) @@ -745,12 +740,8 @@ libbsdiff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libbsdiff_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ libbupsplit_la_LIBADD = -am__libbupsplit_la_SOURCES_DIST = src/libostree/bupsplit.h \ - src/libostree/bupsplit.c -@ENABLE_RUST_FALSE@am_libbupsplit_la_OBJECTS = \ -@ENABLE_RUST_FALSE@ src/libostree/bupsplit.lo +am_libbupsplit_la_OBJECTS = src/libostree/bupsplit.lo libbupsplit_la_OBJECTS = $(am_libbupsplit_la_OBJECTS) -@ENABLE_RUST_FALSE@am_libbupsplit_la_rpath = am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) libglnx_la_DEPENDENCIES = $(am__DEPENDENCIES_2) @@ -778,11 +769,11 @@ libglnx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ libostree_1_la_DEPENDENCIES = libotutil.la libglnx.la libbsdiff.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(bupsplitpath) \ - $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \ - $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \ - $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \ - $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) + $(am__DEPENDENCIES_1) $(bupsplitpath) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \ + $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \ + $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \ + $(am__DEPENDENCIES_11) am__libostree_1_la_SOURCES_DIST = \ src/libostree/ostree-async-progress.c \ src/libostree/ostree-cmdprivate.h \ @@ -808,7 +799,7 @@ am__libostree_1_la_SOURCES_DIST = \ src/libostree/ostree-mutable-tree.c src/libostree/ostree-ref.c \ src/libostree/ostree-remote.c \ src/libostree/ostree-remote-private.h \ - src/libostree/ostree-repo.c \ + src/libostree/ostree-repo-os.c src/libostree/ostree-repo.c \ src/libostree/ostree-repo-checkout.c \ src/libostree/ostree-repo-commit.c \ src/libostree/ostree-repo-pull.c \ @@ -817,6 +808,7 @@ am__libostree_1_la_SOURCES_DIST = \ src/libostree/ostree-repo-libarchive.c \ src/libostree/ostree-repo-prune.c \ src/libostree/ostree-repo-refs.c \ + src/libostree/ostree-repo-verity.c \ src/libostree/ostree-repo-traverse.c \ src/libostree/ostree-repo-private.h \ src/libostree/ostree-repo-file.c \ @@ -929,6 +921,7 @@ am_libostree_1_la_OBJECTS = \ src/libostree/libostree_1_la-ostree-mutable-tree.lo \ src/libostree/libostree_1_la-ostree-ref.lo \ src/libostree/libostree_1_la-ostree-remote.lo \ + src/libostree/libostree_1_la-ostree-repo-os.lo \ src/libostree/libostree_1_la-ostree-repo.lo \ src/libostree/libostree_1_la-ostree-repo-checkout.lo \ src/libostree/libostree_1_la-ostree-repo-commit.lo \ @@ -937,6 +930,7 @@ am_libostree_1_la_OBJECTS = \ src/libostree/libostree_1_la-ostree-repo-libarchive.lo \ src/libostree/libostree_1_la-ostree-repo-prune.lo \ src/libostree/libostree_1_la-ostree-repo-refs.lo \ + src/libostree/libostree_1_la-ostree-repo-verity.lo \ src/libostree/libostree_1_la-ostree-repo-traverse.lo \ src/libostree/libostree_1_la-ostree-repo-file.lo \ src/libostree/libostree_1_la-ostree-repo-file-enumerator.lo \ @@ -1591,6 +1585,7 @@ am__depfiles_remade = bsdiff/$(DEPDIR)/libbsdiff_la-bsdiff.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder-override.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-libarchive.Plo \ + src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-prune.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull-verify.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull.Plo \ @@ -1600,6 +1595,7 @@ am__depfiles_remade = bsdiff/$(DEPDIR)/libbsdiff_la-bsdiff.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-core.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-processing.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Plo \ + src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-rollsum.Plo \ src/libostree/$(DEPDIR)/libostree_1_la-ostree-sepolicy.Plo \ @@ -1779,12 +1775,11 @@ SOURCES = $(libbsdiff_la_SOURCES) $(libbupsplit_la_SOURCES) \ $(tests_test_rollsum_SOURCES) \ $(tests_test_rollsum_cli_SOURCES) tests/test-sysroot-c.c \ $(tests_test_varint_SOURCES) -DIST_SOURCES = $(libbsdiff_la_SOURCES) \ - $(am__libbupsplit_la_SOURCES_DIST) $(libglnx_la_SOURCES) \ - $(am__libostree_1_la_SOURCES_DIST) $(libostreetest_la_SOURCES) \ - $(am__libotutil_la_SOURCES_DIST) $(libreaddir_rand_la_SOURCES) \ - $(am__ostree_SOURCES_DIST) $(ostree_prepare_root_SOURCES) \ - $(ostree_remount_SOURCES) \ +DIST_SOURCES = $(libbsdiff_la_SOURCES) $(libbupsplit_la_SOURCES) \ + $(libglnx_la_SOURCES) $(am__libostree_1_la_SOURCES_DIST) \ + $(libostreetest_la_SOURCES) $(am__libotutil_la_SOURCES_DIST) \ + $(libreaddir_rand_la_SOURCES) $(am__ostree_SOURCES_DIST) \ + $(ostree_prepare_root_SOURCES) $(ostree_remount_SOURCES) \ $(am__ostree_system_generator_SOURCES_DIST) \ $(am__ostree_trivial_httpd_SOURCES_DIST) \ $(am__rofiles_fuse_SOURCES_DIST) \ @@ -2098,8 +2093,8 @@ am__EXEEXT_25 = tests/test-basic.sh tests/test-basic-user.sh \ tests/test-signed-commit.sh tests/test-signed-pull.sh \ tests/test-pre-signed-pull.sh \ tests/test-signed-pull-summary.sh $(am__EXEEXT_2) \ - $(am__EXEEXT_20) $(am__EXEEXT_22) $(am__append_78) \ - $(am__append_81) $(am__EXEEXT_24) + $(am__EXEEXT_20) $(am__EXEEXT_22) $(am__append_74) \ + $(am__append_77) $(am__EXEEXT_24) @ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@am__EXEEXT_26 = \ @ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@ $(am__EXEEXT_25) am__EXEEXT_27 = $(am__EXEEXT_2) $(am__EXEEXT_26) @@ -2313,7 +2308,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RELEASE_VERSION = @RELEASE_VERSION@ -RUST_TARGET_SUBDIR = @RUST_TARGET_SUBDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -2346,7 +2340,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -cargo = @cargo@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -2374,8 +2367,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ -rustc = @rustc@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -2403,27 +2394,26 @@ AM_CFLAGS = -std=gnu99 -fno-strict-aliasing $(WARN_CFLAGS) # Allow the distcheck install under $prefix test to pass AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man \ - --disable-maintainer-mode $(NULL) $(am__append_72) \ - $(am__append_93) \ + --disable-maintainer-mode $(NULL) $(am__append_68) \ + $(am__append_89) \ BASH_COMPLETIONSDIR='$${datadir}/bash-completion/completions' SUBDIRS = . $(am__append_14) NULL = BUILT_SOURCES = $(nodist_libostree_1_la_SOURCES) MANPAGES = -CLEANFILES = $(am__append_13) $(BUILT_SOURCES) $(am__append_51) \ +CLEANFILES = $(am__append_13) $(BUILT_SOURCES) $(am__append_47) \ src/ostree/parse-datetime.c tests/libreaddir-rand.so \ tests/ostree-symlink-stamp \ tests/ostree-prepare-root-symlink-stamp \ tests/ostree-remount-symlink-stamp \ tests/rofiles-fuse-symlink-stamp tests/ostree \ tests/ostree-prepare-root tests/ostree-remount \ - tests/rofiles-fuse $(am__append_102) + tests/rofiles-fuse $(am__append_98) EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) autogen.sh \ - COPYING README.md $(am__append_15) libglnx/README.md \ - libglnx/COPYING libglnx/libglnx.m4 $(NULL) \ - libglnx/Makefile-libglnx.am bsdiff/bsdiff.h bsdiff/bspatch.h \ - bsdiff/LICENSE bsdiff/README.md bsdiff/Makefile-bsdiff.am \ - $(am__append_17) \ + COPYING README.md libglnx/README.md libglnx/COPYING \ + libglnx/libglnx.m4 $(NULL) libglnx/Makefile-libglnx.am \ + bsdiff/bsdiff.h bsdiff/bspatch.h bsdiff/LICENSE \ + bsdiff/README.md bsdiff/Makefile-bsdiff.am \ $(top_srcdir)/src/libostree/libostree-devel.sym \ $(top_srcdir)/src/libostree/libostree-released.sym $(NULL) \ src/libostree/README-gpg src/libostree/bupsplit.h \ @@ -2433,9 +2423,9 @@ EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) autogen.sh \ src/libostree/ostree-repo-deprecated.h \ src/libostree/ostree-version.h src/ostree/parse-datetime.y \ buildutil/tap-driver.sh buildutil/tap-test tests/glib.supp \ - tests/ostree.supp $(NULL) $(am__append_77) $(am__append_80) \ - $(am__append_83) tests/libtest.sh $(am__append_84) \ - $(am__append_89) tests/libostreetest.h tests/libtest.sh \ + tests/ostree.supp $(NULL) $(am__append_73) $(am__append_76) \ + $(am__append_79) tests/libtest.sh $(am__append_80) \ + $(am__append_85) tests/libostreetest.h tests/libtest.sh \ $(NULL) src/boot/dracut/module-setup.sh \ src/boot/dracut/ostree.conf src/boot/mkinitcpio/ostree \ src/boot/ostree-prepare-root.service \ @@ -2443,25 +2433,25 @@ EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) autogen.sh \ src/boot/ostree-remount.service \ src/boot/ostree-finalize-staged.service \ src/boot/grub2/grub2-15_ostree \ - src/boot/grub2/ostree-grub-generator $(NULL) $(am__append_98) \ - $(am__append_101) + src/boot/grub2/ostree-grub-generator $(NULL) $(am__append_94) \ + $(am__append_97) bin_SCRIPTS = lib_LTLIBRARIES = libostree-1.la -pkglibexec_SCRIPTS = $(am__append_94) +pkglibexec_SCRIPTS = $(am__append_90) noinst_LTLIBRARIES = $(am__append_1) libglnx.la libbsdiff.la \ - libotutil.la $(am__append_18) libostreetest.la + libotutil.la libbupsplit.la libostreetest.la privlibdir = $(pkglibdir) privlib_LTLIBRARIES = pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/libostree/ostree-1.pc -INTROSPECTION_GIRS = $(am__append_48) +INTROSPECTION_GIRS = $(am__append_44) girdir = $(datadir)/gir-1.0 -gir_DATA = $(am__append_49) +gir_DATA = $(am__append_45) typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(am__append_50) +typelib_DATA = $(am__append_46) gsettings_SCHEMAS = ostree_bootdir = $(prefix)/lib/ostree -ostree_boot_SCRIPTS = $(am__append_66) $(am__append_96) +ostree_boot_SCRIPTS = $(am__append_62) $(am__append_92) # We should probably consider flipping the default for DEBUG. Also, # include the builddir in $PATH so we find our just-built ostree @@ -2478,7 +2468,7 @@ AM_TESTS_ENVIRONMENT = G_TEST_SRCDIR="$(abs_srcdir)" \ pwd)$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}} PATH=$$(cd \ $(top_builddir)/tests && pwd):$${PATH} \ OSTREE_FEATURES="$(OSTREE_FEATURES)" PYTHONUNBUFFERED=1 \ - $(NULL) $(am__append_74) + $(NULL) $(am__append_70) LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/buildutil/tap-driver.sh LOG_COMPILER = $(top_srcdir)/buildutil/tap-test installed_test_LTLIBRARIES = $(am__append_12) @@ -2518,8 +2508,8 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installe # This initializes some more variables # This is a special facility to chain together hooks easily -INSTALL_DATA_HOOKS = install-mkdir-remotes-d-hook $(am__append_92) \ - $(am__append_95) +INSTALL_DATA_HOOKS = install-mkdir-remotes-d-hook $(am__append_88) \ + $(am__append_91) ALL_LOCAL_RULES = tests/libreaddir-rand.so shortened_sysconfdir = $$(echo "$(sysconfdir)" | sed -e 's|^$(prefix)||' -e 's|^/||') OSTREE_GITREV = $(shell cd $(srcdir) && if command -v git >/dev/null 2>&1 && test -d .git; then git describe --abbrev=42 --tags --always HEAD; fi) @@ -2527,7 +2517,7 @@ ACLOCAL_AMFLAGS = -I buildutil -I libglnx ${ACLOCAL_FLAGS} # Generated by coreos-assembler build-fast and kola GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in \ - gtk-doc.make fastbuild-*.qcow2 _kola_temp/ $(am__append_71) + gtk-doc.make fastbuild-*.qcow2 _kola_temp/ $(am__append_67) OT_INTERNAL_GIO_UNIX_CFLAGS = $(OT_DEP_GIO_UNIX_CFLAGS) OT_INTERNAL_GIO_UNIX_LIBS = $(OT_DEP_GIO_UNIX_LIBS) OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS) @@ -2538,10 +2528,6 @@ OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS) @USE_GPGME_TRUE@OT_INTERNAL_GPGME_LIBS = $(OT_DEP_GPGME_LIBS) $(GPGME_PTHREAD_LIBS) @BUILDOPT_INTROSPECTION_TRUE@GIRS = @BUILDOPT_INTROSPECTION_TRUE@TYPELIBS = $(GIRS:.gir=.typelib) -@ENABLE_RUST_TRUE@@RUST_DEBUG_FALSE@CARGO_RELEASE_ARGS = --release - -# These bits based on gnome:librsvg/Makefile.am -@ENABLE_RUST_TRUE@@RUST_DEBUG_TRUE@CARGO_RELEASE_ARGS = libglnx_srcpath := $(srcdir)/libglnx libglnx_cflags := $(OT_DEP_GIO_UNIX_CFLAGS) "-I$(libglnx_srcpath)" libglnx_libs := $(OT_DEP_GIO_UNIX_LIBS) @@ -2616,7 +2602,7 @@ libotutil_la_SOURCES = src/libotutil/ot-checksum-utils.c \ src/libotutil/ot-variant-builder.h \ src/libotutil/ot-gio-utils.c src/libotutil/ot-gio-utils.h \ src/libotutil/otutil.h src/libotutil/ot-tool-util.c \ - src/libotutil/ot-tool-util.h $(NULL) $(am__append_16) + src/libotutil/ot-tool-util.h $(NULL) $(am__append_15) libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) $(LIBSYSTEMD_CFLAGS) libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) $(LIBSYSTEMD_LIBS) libostree_public_headers = \ @@ -2627,6 +2613,7 @@ libostree_public_headers = \ src/libostree/ostree-dummy-enumtypes.h \ src/libostree/ostree-mutable-tree.h \ src/libostree/ostree-repo.h \ + src/libostree/ostree-repo-os.h \ src/libostree/ostree-types.h \ src/libostree/ostree-repo-file.h \ src/libostree/ostree-diff.h \ @@ -2653,10 +2640,8 @@ libostree_public_headers = \ # This one is generated via configure.ac, and the gtk-doc # code hence needs to look in the builddir. libostree_public_built_headers = src/libostree/ostree-version.h -@ENABLE_RUST_FALSE@bupsplitpath = libbupsplit.la -@ENABLE_RUST_TRUE@bupsplitpath = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/libbupsplit_rs.a -@ENABLE_RUST_TRUE@BUPSPLIT_RUST_SRCS = rust/src/bupsplit.rs -@ENABLE_RUST_FALSE@libbupsplit_la_SOURCES = src/libostree/bupsplit.h src/libostree/bupsplit.c +bupsplitpath = libbupsplit.la +libbupsplit_la_SOURCES = src/libostree/bupsplit.h src/libostree/bupsplit.c libostreeincludedir = $(includedir)/ostree-1 libostreeinclude_HEADERS = $(libostree_public_headers) $(libostree_public_built_headers) ENUM_TYPES = $(NULL) $(srcdir)/src/libostree/ostree-fetcher.h @@ -2689,7 +2674,7 @@ libostree_1_la_SOURCES = src/libostree/ostree-async-progress.c \ src/libostree/ostree-mutable-tree.c src/libostree/ostree-ref.c \ src/libostree/ostree-remote.c \ src/libostree/ostree-remote-private.h \ - src/libostree/ostree-repo.c \ + src/libostree/ostree-repo-os.c src/libostree/ostree-repo.c \ src/libostree/ostree-repo-checkout.c \ src/libostree/ostree-repo-commit.c \ src/libostree/ostree-repo-pull.c \ @@ -2698,6 +2683,7 @@ libostree_1_la_SOURCES = src/libostree/ostree-async-progress.c \ src/libostree/ostree-repo-libarchive.c \ src/libostree/ostree-repo-prune.c \ src/libostree/ostree-repo-refs.c \ + src/libostree/ostree-repo-verity.c \ src/libostree/ostree-repo-traverse.c \ src/libostree/ostree-repo-private.h \ src/libostree/ostree-repo-file.c \ @@ -2737,11 +2723,11 @@ libostree_1_la_SOURCES = src/libostree/ostree-async-progress.c \ src/libostree/ostree-repo-finder-mount.c \ src/libostree/ostree-repo-finder-override.c \ src/libostree/ostree-kernel-args.h \ - src/libostree/ostree-kernel-args.c $(NULL) $(am__append_19) \ + src/libostree/ostree-kernel-args.c $(NULL) $(am__append_16) \ + $(am__append_17) $(am__append_18) $(am__append_19) \ $(am__append_20) $(am__append_21) $(am__append_22) \ - $(am__append_23) $(am__append_24) $(am__append_25) \ - $(am__append_33) $(am__append_34) $(am__append_37) \ - $(am__append_40) src/libostree/ostree-sign.c \ + $(am__append_29) $(am__append_30) $(am__append_33) \ + $(am__append_36) src/libostree/ostree-sign.c \ src/libostree/ostree-sign.h src/libostree/ostree-sign-dummy.c \ src/libostree/ostree-sign-dummy.h \ src/libostree/ostree-sign-ed25519.c \ @@ -2751,6 +2737,7 @@ libostree_experimental_headers = \ symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym +# Uncomment this include when adding new development symbols. #if BUILDOPT_IS_DEVEL_BUILD #symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym #endif @@ -2764,17 +2751,17 @@ libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/bsdiff \ $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS) \ $(OT_DEP_CRYPTO_CFLAGS) -fvisibility=hidden \ '-D_OSTREE_PUBLIC=__attribute__((visibility("default"))) \ - extern' $(am__append_27) $(am__append_29) $(am__append_31) \ - $(am__append_35) $(am__append_38) $(am__append_41) \ - $(am__append_43) $(am__append_45) + extern' $(am__append_23) $(am__append_25) $(am__append_27) \ + $(am__append_31) $(am__append_34) $(am__append_37) \ + $(am__append_39) $(am__append_41) libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions $(addprefix $(wl_versionscript_arg),$(symbol_files)) +# Some change between rust-1.21.0-1.fc27 and rust-1.22.1-1.fc27.x86_64 libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la \ $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \ $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) $(OT_DEP_CRYPTO_LIBS) \ - $(am__append_26) $(bupsplitpath) $(am__append_28) \ - $(am__append_30) $(am__append_32) $(am__append_36) \ - $(am__append_39) $(am__append_42) $(am__append_44) \ - $(am__append_46) + $(bupsplitpath) $(am__append_24) $(am__append_26) \ + $(am__append_28) $(am__append_32) $(am__append_35) \ + $(am__append_38) $(am__append_40) $(am__append_42) EXTRA_libostree_1_la_DEPENDENCIES = $(symbol_files) # XXX: work around clang being passed -fstack-clash-protection which it doesn't understand @@ -2784,7 +2771,7 @@ INTROSPECTION_SCANNER_ENV = CC=gcc @BUILDOPT_INTROSPECTION_TRUE@OSTree_1_0_gir_INCLUDES = Gio-2.0 @BUILDOPT_INTROSPECTION_TRUE@OSTree_1_0_gir_CFLAGS = \ @BUILDOPT_INTROSPECTION_TRUE@ $(libostree_1_la_CFLAGS) \ -@BUILDOPT_INTROSPECTION_TRUE@ $(am__append_47) +@BUILDOPT_INTROSPECTION_TRUE@ $(am__append_43) @BUILDOPT_INTROSPECTION_TRUE@OSTree_1_0_gir_LIBS = libostree-1.la @BUILDOPT_INTROSPECTION_TRUE@OSTree_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Ostree --symbol-prefix=ostree $(GI_SCANNERFLAGS) @BUILDOPT_INTROSPECTION_TRUE@OSTree_1_0_gir_FILES = $(libostreeinclude_HEADERS) $(filter-out %-private.h %/ostree-soup-uri.h $(libostree_experimental_headers),$(libostree_1_la_SOURCES)) @@ -2813,8 +2800,8 @@ ostree_SOURCES = src/ostree/main.c src/ostree/ot-builtin-admin.c \ src/ostree/ot-builtin-static-delta.c src/ostree/ot-main.h \ src/ostree/ot-main.c src/ostree/ot-dump.h src/ostree/ot-dump.c \ src/ostree/ot-editor.c src/ostree/ot-editor.h \ - src/ostree/parse-datetime.h $(NULL) $(am__append_52) \ - $(am__append_53) src/ostree/ot-admin-builtin-init-fs.c \ + src/ostree/parse-datetime.h $(NULL) $(am__append_48) \ + $(am__append_49) src/ostree/ot-admin-builtin-init-fs.c \ src/ostree/ot-admin-builtin-diff.c \ src/ostree/ot-admin-builtin-deploy.c \ src/ostree/ot-admin-builtin-finalize-staged.c \ @@ -2842,7 +2829,7 @@ ostree_SOURCES = src/ostree/main.c src/ostree/ot-builtin-admin.c \ src/ostree/ot-remote-builtin-show-url.c \ src/ostree/ot-remote-builtin-refs.c \ src/ostree/ot-remote-builtin-summary.c $(NULL) \ - $(am__append_54) $(am__append_55) $(am__append_56) + $(am__append_50) $(am__append_51) $(am__append_52) nodist_ostree_SOURCES = \ src/ostree/parse-datetime.c \ $(NULL) @@ -2854,11 +2841,11 @@ ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/sr ostree_bin_shared_ldadd = $(AM_LDFLAGS) libglnx.la libotutil.la libostree-1.la \ $(OT_INTERNAL_GIO_UNIX_LIBS) -ostree_CFLAGS = $(ostree_bin_shared_cflags) $(am__append_58) \ - $(am__append_60) $(am__append_62) +ostree_CFLAGS = $(ostree_bin_shared_cflags) $(am__append_54) \ + $(am__append_56) $(am__append_58) ostree_LDADD = $(ostree_bin_shared_ldadd) libbsdiff.la \ - $(LIBSYSTEMD_LIBS) $(am__append_59) $(am__append_61) \ - $(am__append_63) + $(LIBSYSTEMD_LIBS) $(am__append_55) $(am__append_57) \ + $(am__append_59) @USE_LIBSOUP_TRUE@ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c @USE_LIBSOUP_TRUE@ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) @USE_LIBSOUP_TRUE@ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) @@ -2867,8 +2854,8 @@ ostree_prepare_root_SOURCES = \ src/switchroot/ostree-prepare-root.c \ $(NULL) -ostree_prepare_root_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_68) \ - $(am__append_69) +ostree_prepare_root_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_64) \ + $(am__append_65) @BUILDOPT_USE_STATIC_COMPILER_FALSE@ostree_prepare_root_CFLAGS = $(AM_CFLAGS) -Isrc/switchroot ostree_remount_SOURCES = \ src/switchroot/ostree-mount-util.h \ @@ -2877,7 +2864,7 @@ ostree_remount_SOURCES = \ ostree_remount_CPPFLAGS = $(AM_CPPFLAGS) \ $(OT_INTERNAL_GIO_UNIX_CFLAGS) -Isrc/switchroot \ - -I$(srcdir)/libglnx $(am__append_70) + -I$(srcdir)/libglnx $(am__append_66) ostree_remount_LDADD = $(AM_LDFLAGS) $(OT_INTERNAL_GIO_UNIX_LIBS) libglnx.la @BUILDOPT_SYSTEMD_TRUE@ostree_prepare_root_LDADD = $(AM_LDFLAGS) $(LIBSYSTEMD_LIBS) @BUILDOPT_SYSTEMD_AND_LIBMOUNT_TRUE@ostree_system_generator_SOURCES = src/switchroot/ostree-mount-util.h \ @@ -2894,7 +2881,7 @@ ostree_remount_LDADD = $(AM_LDFLAGS) $(OT_INTERNAL_GIO_UNIX_LIBS) libglnx.la @BUILDOPT_FUSE_TRUE@rofiles_fuse_LDADD = libglnx.la $(BUILDOPT_FUSE_LIBS) $(OT_INTERNAL_GIO_UNIX_LIBS) libostree-1.la uninstalled_test_data = tests/ostree-symlink-stamp \ tests/ostree-prepare-root-symlink-stamp \ - tests/ostree-remount-symlink-stamp $(am__append_79) + tests/ostree-remount-symlink-stamp $(am__append_75) dist_uninstalled_test_scripts = tests/test-symbols.sh tests/coccinelle.sh # This logic implements ENABLE_INSTALLED_TESTS_EXCLUSIVE; see below. @@ -2902,10 +2889,10 @@ dist_uninstalled_test_scripts = tests/test-symbols.sh tests/coccinelle.sh # tests *only* run installed, to avoid having to run them twice in CI. # This overrides the glib-tap.mk emphasis on doing both, if we'd # used e.g. `dist_test_scripts`. -dist_test_scripts = $(NULL) $(am__append_90) +dist_test_scripts = $(NULL) $(am__append_86) test_programs = tests/test-bloom tests/test-repo-finder-config \ - tests/test-repo-finder-mount $(NULL) $(am__append_87) \ - $(am__append_91) + tests/test-repo-finder-mount $(NULL) $(am__append_83) \ + $(am__append_87) _installed_or_uninstalled_test_scripts = tests/test-basic.sh \ tests/test-basic-user.sh tests/test-basic-user-only.sh \ tests/test-basic-root.sh tests/test-pull-subpath.sh \ @@ -2961,9 +2948,9 @@ _installed_or_uninstalled_test_scripts = tests/test-basic.sh \ tests/test-pull-collections.sh tests/test-config.sh \ tests/test-signed-commit.sh tests/test-signed-pull.sh \ tests/test-pre-signed-pull.sh \ - tests/test-signed-pull-summary.sh $(NULL) $(am__append_75) \ - $(am__append_76) $(am__append_78) $(am__append_81) \ - $(am__append_82) + tests/test-signed-pull-summary.sh $(NULL) $(am__append_71) \ + $(am__append_72) $(am__append_74) $(am__append_77) \ + $(am__append_78) experimental_test_scripts = \ $(NULL) @@ -3042,7 +3029,7 @@ libreaddir_rand_la_LIBADD = \ $(NULL) libreaddir_rand_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \ - $(am__append_85) + $(am__append_81) _installed_or_uninstalled_test_programs = tests/test-varint \ tests/test-ot-unix-utils tests/test-bsdiff \ tests/test-mutable-tree tests/test-keyfile-utils \ @@ -3050,7 +3037,7 @@ _installed_or_uninstalled_test_programs = tests/test-varint \ tests/test-checksum tests/test-lzma tests/test-rollsum \ tests/test-basic-c tests/test-sysroot-c tests/test-pull-c \ tests/test-repo tests/test-include-ostree-h tests/test-kargs \ - tests/test-rfc2616-dates $(am__append_86) $(am__append_88) + tests/test-rfc2616-dates $(am__append_82) $(am__append_84) common_tests_cflags = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/libglnx common_tests_ldadd = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) libostreetest_la_SOURCES = tests/libostreetest.c tests/test-mock-gio.c tests/test-mock-gio.h @@ -3177,8 +3164,8 @@ tests_test_rfc2616_dates_LDADD = $(TESTS_LDADD) @ENABLE_MAN_TRUE@ ostree-pull.1 ostree-refs.1 ostree-remote.1 \ @ENABLE_MAN_TRUE@ ostree-reset.1 ostree-rev-parse.1 \ @ENABLE_MAN_TRUE@ ostree-show.1 ostree-sign.1 ostree-summary.1 \ -@ENABLE_MAN_TRUE@ ostree-static-delta.1 $(am__append_97) \ -@ENABLE_MAN_TRUE@ $(am__append_99) $(am__append_100) +@ENABLE_MAN_TRUE@ ostree-static-delta.1 $(am__append_93) \ +@ENABLE_MAN_TRUE@ $(am__append_95) $(am__append_96) @ENABLE_MAN_TRUE@man5_files = ostree.repo.5 ostree.repo-config.5 @ENABLE_MAN_TRUE@man1_MANS = $(addprefix man/,$(man1_files)) @ENABLE_MAN_TRUE@man5_MANS = $(addprefix man/,$(man5_files)) @@ -3765,7 +3752,7 @@ src/libostree/bupsplit.lo: src/libostree/$(am__dirstamp) \ src/libostree/$(DEPDIR)/$(am__dirstamp) libbupsplit.la: $(libbupsplit_la_OBJECTS) $(libbupsplit_la_DEPENDENCIES) $(EXTRA_libbupsplit_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libbupsplit_la_rpath) $(libbupsplit_la_OBJECTS) $(libbupsplit_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libbupsplit_la_OBJECTS) $(libbupsplit_la_LIBADD) $(LIBS) libglnx/$(am__dirstamp): @$(MKDIR_P) libglnx @: > libglnx/$(am__dirstamp) @@ -3844,6 +3831,9 @@ src/libostree/libostree_1_la-ostree-ref.lo: \ src/libostree/libostree_1_la-ostree-remote.lo: \ src/libostree/$(am__dirstamp) \ src/libostree/$(DEPDIR)/$(am__dirstamp) +src/libostree/libostree_1_la-ostree-repo-os.lo: \ + src/libostree/$(am__dirstamp) \ + src/libostree/$(DEPDIR)/$(am__dirstamp) src/libostree/libostree_1_la-ostree-repo.lo: \ src/libostree/$(am__dirstamp) \ src/libostree/$(DEPDIR)/$(am__dirstamp) @@ -3868,6 +3858,9 @@ src/libostree/libostree_1_la-ostree-repo-prune.lo: \ src/libostree/libostree_1_la-ostree-repo-refs.lo: \ src/libostree/$(am__dirstamp) \ src/libostree/$(DEPDIR)/$(am__dirstamp) +src/libostree/libostree_1_la-ostree-repo-verity.lo: \ + src/libostree/$(am__dirstamp) \ + src/libostree/$(DEPDIR)/$(am__dirstamp) src/libostree/libostree_1_la-ostree-repo-traverse.lo: \ src/libostree/$(am__dirstamp) \ src/libostree/$(DEPDIR)/$(am__dirstamp) @@ -4845,6 +4838,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder-override.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-libarchive.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-prune.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull-verify.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull.Plo@am__quote@ # am--include-marker @@ -4854,6 +4848,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-core.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-processing.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-rollsum.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/libostree/$(DEPDIR)/libostree_1_la-ostree-sepolicy.Plo@am__quote@ # am--include-marker @@ -5213,6 +5208,13 @@ src/libostree/libostree_1_la-ostree-remote.lo: src/libostree/ostree-remote.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -c -o src/libostree/libostree_1_la-ostree-remote.lo `test -f 'src/libostree/ostree-remote.c' || echo '$(srcdir)/'`src/libostree/ostree-remote.c +src/libostree/libostree_1_la-ostree-repo-os.lo: src/libostree/ostree-repo-os.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -MT src/libostree/libostree_1_la-ostree-repo-os.lo -MD -MP -MF src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Tpo -c -o src/libostree/libostree_1_la-ostree-repo-os.lo `test -f 'src/libostree/ostree-repo-os.c' || echo '$(srcdir)/'`src/libostree/ostree-repo-os.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Tpo src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libostree/ostree-repo-os.c' object='src/libostree/libostree_1_la-ostree-repo-os.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -c -o src/libostree/libostree_1_la-ostree-repo-os.lo `test -f 'src/libostree/ostree-repo-os.c' || echo '$(srcdir)/'`src/libostree/ostree-repo-os.c + src/libostree/libostree_1_la-ostree-repo.lo: src/libostree/ostree-repo.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -MT src/libostree/libostree_1_la-ostree-repo.lo -MD -MP -MF src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Tpo -c -o src/libostree/libostree_1_la-ostree-repo.lo `test -f 'src/libostree/ostree-repo.c' || echo '$(srcdir)/'`src/libostree/ostree-repo.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Tpo src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Plo @@ -5269,6 +5271,13 @@ src/libostree/libostree_1_la-ostree-repo-refs.lo: src/libostree/ostree-repo-refs @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -c -o src/libostree/libostree_1_la-ostree-repo-refs.lo `test -f 'src/libostree/ostree-repo-refs.c' || echo '$(srcdir)/'`src/libostree/ostree-repo-refs.c +src/libostree/libostree_1_la-ostree-repo-verity.lo: src/libostree/ostree-repo-verity.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -MT src/libostree/libostree_1_la-ostree-repo-verity.lo -MD -MP -MF src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Tpo -c -o src/libostree/libostree_1_la-ostree-repo-verity.lo `test -f 'src/libostree/ostree-repo-verity.c' || echo '$(srcdir)/'`src/libostree/ostree-repo-verity.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Tpo src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libostree/ostree-repo-verity.c' object='src/libostree/libostree_1_la-ostree-repo-verity.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -c -o src/libostree/libostree_1_la-ostree-repo-verity.lo `test -f 'src/libostree/ostree-repo-verity.c' || echo '$(srcdir)/'`src/libostree/ostree-repo-verity.c + src/libostree/libostree_1_la-ostree-repo-traverse.lo: src/libostree/ostree-repo-traverse.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libostree_1_la_CFLAGS) $(CFLAGS) -MT src/libostree/libostree_1_la-ostree-repo-traverse.lo -MD -MP -MF src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Tpo -c -o src/libostree/libostree_1_la-ostree-repo-traverse.lo `test -f 'src/libostree/ostree-repo-traverse.c' || echo '$(srcdir)/'`src/libostree/ostree-repo-traverse.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Tpo src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Plo @@ -8877,7 +8886,6 @@ test-libglnx-shutil.log: test-libglnx-shutil$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -@ENABLE_RUST_FALSE@dist-hook: distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -8939,9 +8947,6 @@ distdir-am: $(DISTFILES) || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -9078,7 +9083,7 @@ distcleancheck: distclean || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 -@ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@@ENABLE_RUST_FALSE@check-local: +@ENABLE_INSTALLED_TESTS_EXCLUSIVE_FALSE@check-local: check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \ $(check_SCRIPTS) $(check_DATA) @@ -9148,17 +9153,16 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@ENABLE_RUST_FALSE@clean-local: clean: clean-recursive clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \ clean-generic clean-installed_testLTLIBRARIES \ clean-installed_testPROGRAMS clean-libLTLIBRARIES \ - clean-libexecPROGRAMS clean-libtool clean-local \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - clean-ostree_bootPROGRAMS clean-pkglibexecPROGRAMS \ - clean-privlibLTLIBRARIES clean-sbinPROGRAMS \ - clean-systemdsystemgeneratorPROGRAMS mostlyclean-am + clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS clean-ostree_bootPROGRAMS \ + clean-pkglibexecPROGRAMS clean-privlibLTLIBRARIES \ + clean-sbinPROGRAMS clean-systemdsystemgeneratorPROGRAMS \ + mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -9230,6 +9234,7 @@ distclean: distclean-recursive -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder-override.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-libarchive.Plo + -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-prune.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull-verify.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull.Plo @@ -9239,6 +9244,7 @@ distclean: distclean-recursive -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-core.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-processing.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Plo + -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-rollsum.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-sepolicy.Plo @@ -9506,6 +9512,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder-override.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-finder.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-libarchive.Plo + -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-os.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-prune.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull-verify.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-pull.Plo @@ -9515,6 +9522,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-core.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-static-delta-processing.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-traverse.Plo + -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo-verity.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-repo.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-rollsum.Plo -rm -f src/libostree/$(DEPDIR)/libostree_1_la-ostree-sepolicy.Plo @@ -9697,19 +9705,18 @@ uninstall-man: uninstall-man1 uninstall-man5 clean-checkPROGRAMS clean-cscope clean-generic \ clean-installed_testLTLIBRARIES clean-installed_testPROGRAMS \ clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ - clean-local clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-ostree_bootPROGRAMS clean-pkglibexecPROGRAMS \ clean-privlibLTLIBRARIES clean-sbinPROGRAMS \ clean-systemdsystemgeneratorPROGRAMS cscope cscopelist-am \ - ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS \ - install-binSCRIPTS install-data install-data-am \ - install-data-hook install-dist_completionsDATA \ - install-dist_gpginsttestDATA \ + ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \ + dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-binSCRIPTS \ + install-data install-data-am install-data-hook \ + install-dist_completionsDATA install-dist_gpginsttestDATA \ install-dist_gpginsttest_revocDATA \ install-dist_gpginsttest_trustedDATA \ install-dist_gpgvinsttestDATA install-dist_systemdtmpfilesDATA \ @@ -9771,19 +9778,6 @@ install-data-hook: $(INSTALL_DATA_HOOKS) all-local: $(ALL_LOCAL_RULES) @BUILDOPT_INTROSPECTION_TRUE@include $(INTROSPECTION_MAKEFILE) - -@ENABLE_RUST_TRUE@check-local: -@ENABLE_RUST_TRUE@ cd $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo test - -@ENABLE_RUST_TRUE@clean-local: -@ENABLE_RUST_TRUE@ cd $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo clean - -@ENABLE_RUST_TRUE@dist-hook: -@ENABLE_RUST_TRUE@ (cd $(distdir)/rust && \ -@ENABLE_RUST_TRUE@ cp $(abs_top_srcdir)/rust/Cargo.lock . && \ -@ENABLE_RUST_TRUE@ cargo vendor -q && \ -@ENABLE_RUST_TRUE@ mkdir .cargo && \ -@ENABLE_RUST_TRUE@ cp cargo-vendor-config .cargo/config) # See also autogen.sh and https://github.com/ostreedev/ostree/pull/1274/ # # v2017.12 didn't include test-libglnx-shutil.c, but if you re-run @@ -9794,8 +9788,6 @@ $(srcdir)/libglnx/Makefile-libglnx.am.inc: $(srcdir)/libglnx/Makefile-libglnx.am # See the comment for the similar libglnx bit above $(srcdir)/bsdiff/Makefile-bsdiff.am.inc: $(srcdir)/bsdiff/Makefile-bsdiff.am sed -e 's,$$(libbsdiff_srcpath),bsdiff,g' < $< > $@ -@ENABLE_RUST_TRUE@$(bupsplitpath): Makefile $(BUPSPLIT_RUST_SRCS) -@ENABLE_RUST_TRUE@ cd $(top_srcdir)/rust && CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build --verbose $(CARGO_RELEASE_ARGS) # TODO: GLIB_CHECK_VERSION > 2.5x: use --output instead of mv (see https://github.com/ostreedev/ostree/pull/1329) src/libostree/ostree-enumtypes.h: src/libostree/ostree-enumtypes.h.template $(ENUM_TYPES) diff --git a/README.md b/README.md index be6f6453..fcde7015 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ version of - Binary history on the server side (and client) - Introspectable shared library API for build and deployment systems - Flexible support for multiple branches and repositories, supporting - projects like [flatpak](https://github.com/flatpak/flatpak) which + projects like [Flatpak](https://github.com/flatpak/flatpak) which use libostree for applications, rather than hosts. ## Documentation @@ -38,12 +38,19 @@ For more information, see the [project documentation](docs/index.md) or the ## Operating systems and distributions using OSTree +[Apertis](https://www.apertis.org/) uses libostree for their host system as +well as Flatpak. See [update documentation](https://www.apertis.org/guides/ostree/) and +[apertis-update-manager](https://gitlab.apertis.org/pkg/apertis-update-manager) + [Endless OS](https://endlessos.com/) uses libostree for their host system as -well as flatpak. See +well as Flatpak. See their [eos-updater](https://github.com/endlessm/eos-updater) and [deb-ostree-builder](https://github.com/dbnicholson/deb-ostree-builder) projects. +For Debian/apt, see also https://github.com/stb-tester/apt2ostree +and the LWN article [Merkle trees and build systems](https://lwn.net/Articles/821367/). + Fedora derivatives use rpm-ostree (noted below); there are 3 variants using OSTree: - [Fedora CoreOS](https://getfedora.org/en/coreos/) @@ -59,6 +66,9 @@ uses rpm-ostree as well. where OSTree was born - as a high performance continuous delivery/testing system for GNOME. +[GNOME OS](https://os.gnome.org/) is a testing OS that uses libostree for +their host system as well as Flatpak. + [Liri OS](https://liri.io/download/silverblue/) has the option to install their distribution using ostree. @@ -89,10 +99,10 @@ model for image and package systems. [eos-updater](https://github.com/endlessm/eos-updater) is a daemon that implements updates on EndlessOS. -[flatpak](https://github.com/flatpak/flatpak) uses libostree for desktop -application containers. Unlike most of the other systems here, flatpak does not +[Flatpak](https://github.com/flatpak/flatpak) uses libostree for desktop +application containers. Unlike most of the other systems here, Flatpak does not use the "libostree host system" aspects (e.g. bootloader management), just the -"git-like hardlink dedup". For example, flatpak supports a per-user OSTree +"git-like hardlink dedup". For example, Flatpak supports a per-user OSTree repository. ## Language bindings @@ -134,9 +144,15 @@ make make install DESTDIR=/path/to/dest ``` +## Contact and discussion forums + +OSTree has a [mailing list](https://mail.gnome.org/archives/ostree-list/) and +there is also an `#ostree` channel on FreeNode. However, asynchronous+logged +communication is preferred for nontrivial questions. + ## Contributing -See [Contributing](docs/CONTRIBUTING.md). +See [Contributing](CONTRIBUTING.md). ## Licensing diff --git a/aclocal.m4 b/aclocal.m4 index a5e6b55f..baea2d23 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -702,7 +702,7 @@ AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 12 (pkg-config-0.29.2) +# serial 11 (pkg-config-0.29.1) dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson @@ -744,7 +744,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.2]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -845,7 +845,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $2]) +AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -855,11 +855,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -876,7 +876,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -977,6 +977,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/apidoc/Makefile.in b/apidoc/Makefile.in index e00c2b23..022dabe5 100644 --- a/apidoc/Makefile.in +++ b/apidoc/Makefile.in @@ -318,7 +318,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RELEASE_VERSION = @RELEASE_VERSION@ -RUST_TARGET_SUBDIR = @RUST_TARGET_SUBDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -351,7 +350,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -cargo = @cargo@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -379,8 +377,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ -rustc = @rustc@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -399,6 +395,7 @@ libostree_public_headers = \ src/libostree/ostree-dummy-enumtypes.h \ src/libostree/ostree-mutable-tree.h \ src/libostree/ostree-repo.h \ + src/libostree/ostree-repo-os.h \ src/libostree/ostree-types.h \ src/libostree/ostree-repo-file.h \ src/libostree/ostree-diff.h \ @@ -549,6 +546,7 @@ DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ + $(DOC_MODULE).actions \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ $(DOC_MODULE).interfaces \ diff --git a/apidoc/html/home.png b/apidoc/html/home.png index 62207b60..9346b336 100644 Binary files a/apidoc/html/home.png and b/apidoc/html/home.png differ diff --git a/apidoc/html/index.html b/apidoc/html/index.html index d14c1892..307015cb 100644 --- a/apidoc/html/index.html +++ b/apidoc/html/index.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
-

for OSTree 2020.8

+

for OSTree 2021.1

@@ -71,6 +71,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/apidoc/html/left-insensitive.png b/apidoc/html/left-insensitive.png index 88c70161..3269393a 100644 Binary files a/apidoc/html/left-insensitive.png and b/apidoc/html/left-insensitive.png differ diff --git a/apidoc/html/left.png b/apidoc/html/left.png index a9ed9685..2abde032 100644 Binary files a/apidoc/html/left.png and b/apidoc/html/left.png differ diff --git a/apidoc/html/ostree-Core-repository-independent-functions.html b/apidoc/html/ostree-Core-repository-independent-functions.html index b579cf35..ddbae104 100644 --- a/apidoc/html/ostree-Core-repository-independent-functions.html +++ b/apidoc/html/ostree-Core-repository-independent-functions.html @@ -8,7 +8,7 @@ - + @@ -46,7 +46,7 @@ -const GVariantType * +const GVariantType * ostree_metadata_variant_type () @@ -54,7 +54,7 @@ -gboolean +gboolean ostree_validate_checksum_string () @@ -62,7 +62,7 @@ -guchar * +guchar * ostree_checksum_to_bytes () @@ -70,7 +70,7 @@ -GVariant * +GVariant * ostree_checksum_to_bytes_v () @@ -109,14 +109,14 @@ -const guchar * +const guchar * ostree_checksum_bytes_peek () -const guchar * +const guchar * ostree_checksum_bytes_peek_validate () @@ -132,7 +132,7 @@ -guchar * +guchar * ostree_checksum_b64_to_bytes () @@ -164,7 +164,7 @@ -gboolean +gboolean ostree_validate_rev () @@ -172,7 +172,7 @@ -gboolean +gboolean ostree_validate_remote_name () @@ -180,7 +180,7 @@ -gboolean +gboolean ostree_parse_refspec () @@ -203,7 +203,7 @@ -guint +guint ostree_hash_object_name () @@ -211,7 +211,7 @@ -GVariant * +GVariant * ostree_object_name_serialize () @@ -243,7 +243,7 @@ -gboolean +gboolean ostree_content_stream_parse () @@ -251,7 +251,7 @@ -gboolean +gboolean ostree_content_file_parse () @@ -259,7 +259,7 @@ -gboolean +gboolean ostree_content_file_parse_at () @@ -267,7 +267,7 @@ -gboolean +gboolean ostree_raw_file_to_archive_z2_stream () @@ -275,7 +275,7 @@ -gboolean +gboolean ostree_raw_file_to_archive_z2_stream_with_options () @@ -283,7 +283,7 @@ -gboolean +gboolean ostree_raw_file_to_content_stream () @@ -291,7 +291,7 @@ -gboolean +gboolean ostree_break_hardlink () @@ -299,7 +299,7 @@ -gboolean +gboolean ostree_checksum_file_from_input () @@ -307,7 +307,7 @@ -gboolean +gboolean ostree_checksum_file () @@ -315,7 +315,7 @@ -gboolean +gboolean ostree_checksum_file_at () @@ -331,7 +331,7 @@ -gboolean +gboolean ostree_checksum_file_async_finish () @@ -339,7 +339,7 @@ -GVariant * +GVariant * ostree_create_directory_metadata () @@ -347,7 +347,7 @@ -gboolean +gboolean ostree_validate_structureof_objtype () @@ -355,7 +355,7 @@ -gboolean +gboolean ostree_validate_structureof_csum_v () @@ -363,7 +363,7 @@ -gboolean +gboolean ostree_validate_structureof_checksum_string () @@ -371,7 +371,7 @@ -gboolean +gboolean ostree_validate_structureof_file_mode () @@ -379,7 +379,7 @@ -gboolean +gboolean ostree_validate_structureof_commit () @@ -387,7 +387,7 @@ -gboolean +gboolean ostree_validate_structureof_dirtree () @@ -395,7 +395,7 @@ -gboolean +gboolean ostree_validate_structureof_dirmeta () @@ -403,7 +403,7 @@ -gchar * +gchar * ostree_commit_get_parent () @@ -411,7 +411,7 @@ -guint64 +guint64 ostree_commit_get_timestamp () @@ -419,7 +419,15 @@ -gchar * +gboolean + + +ostree_commit_metadata_for_bootable () + + + + +gchar * ostree_commit_get_content_checksum () @@ -427,7 +435,7 @@ -gboolean +gboolean ostree_commit_get_object_sizes () @@ -459,7 +467,7 @@ -gboolean +gboolean ostree_check_version () @@ -543,11 +551,11 @@

Description

These functions implement repository-independent algorithms for operating on the core OSTree data formats, such as converting -GFileInfo into a GVariant.

+GFileInfo into a GVariant.

There are 4 types of objects; file, dirmeta, tree, and commit. The last 3 are metadata, and the file object is the only content object type.

-

All metadata objects are stored as GVariant (big endian). The +

All metadata objects are stored as GVariant (big endian). The rationale for this is the same as that of the ext{2,3,4} family of filesystems; most developers will be using LE, and so it's better to continually test the BE->LE swap.

@@ -576,21 +584,21 @@ to continually test the BE->LE swap.

Returns

-

TRUE if object type is metadata

+

TRUE if object type is metadata

ostree_metadata_variant_type ()

-
const GVariantType *
+
const GVariantType *
 ostree_metadata_variant_type (OstreeObjectType objtype);

ostree_validate_checksum_string ()

-
gboolean
+
gboolean
 ostree_validate_checksum_string (const char *sha256,
-                                 GError **error);

+                                 GError **error);

Use this function to see if input strings are checksums.

Parameters

@@ -616,14 +624,14 @@ ostree_validate_checksum_string (const

Returns

-

TRUE if sha256 -is a valid checksum string, FALSE otherwise

+

TRUE if sha256 +is a valid checksum string, FALSE otherwise

ostree_checksum_to_bytes ()

-
guchar *
+
guchar *
 ostree_checksum_to_bytes (const char *checksum);

 

 
Parameters

@@ -643,14 +651,14 @@ ostree_checksum_to_bytes (const c
 

 
Returns

 
Binary checksum from checksum
-of length 32; free with g_free(). 

+of length 32; free with g_free(). 

 
[transfer full][array fixed-size=32]

 

 

 

 

 
ostree_checksum_to_bytes_v ()

-
GVariant *
+
GVariant *
 ostree_checksum_to_bytes_v (const char *checksum);

 

 
Parameters

@@ -669,7 +677,7 @@ ostree_checksum_to_bytes_v (const 
 

 
Returns

-
New GVariant of type ay with length 32. 

+
New GVariant of type ay with length 32. 

 
[transfer full]

 

 

@@ -677,7 +685,7 @@ ostree_checksum_to_bytes_v (const 
 
ostree_checksum_from_bytes ()

 
char *
-ostree_checksum_from_bytes (const guchar *csum);

+ostree_checksum_from_bytes (const guchar *csum);

 

 
Parameters

 

@@ -704,7 +712,7 @@ ostree_checksum_from_bytes (const 
 
ostree_checksum_from_bytes_v ()

 
char *
-ostree_checksum_from_bytes_v (GVariant *csum_v);

+ostree_checksum_from_bytes_v (GVariant *csum_v);
 

 
Parameters

 

@@ -715,7 +723,7 @@ ostree_checksum_from_bytes_v (
csum_v

-
+
GVariant of type ay
GVariant of type ay

  
 

 

@@ -731,7 +739,7 @@ ostree_checksum_from_bytes_v (
 
ostree_checksum_inplace_from_bytes ()

 
void
-ostree_checksum_inplace_from_bytes (const guchar *csum,
+ostree_checksum_inplace_from_bytes (const guchar *csum,
                                     char *buf);

 
Overwrite the contents of buf
  with stringified version of csum
@@ -765,7 +773,7 @@ ostree_checksum_inplace_from_bytes (const 
ostree_checksum_inplace_to_bytes ()

 
void
 ostree_checksum_inplace_to_bytes (const char *checksum,
-                                  guchar *buf);

+                                  guchar *buf);

Convert checksum from a string to binary in-place, without allocating memory. Use this function in hot code paths.

@@ -795,8 +803,8 @@ allocating memory. Use this function in hot code paths.

ostree_checksum_bytes_peek ()

-
const guchar *
-ostree_checksum_bytes_peek (GVariant *bytes);
+
const guchar *
+ostree_checksum_bytes_peek (GVariant *bytes);

Parameters

@@ -807,7 +815,7 @@ ostree_checksum_bytes_peek (

bytes

- +

GVariant of type ay

GVariant of type ay

  
@@ -816,16 +824,16 @@ ostree_checksum_bytes_peek (

Returns

Binary checksum data in bytes ; do not free. If bytes -does not have the correct length, return NULL.

+does not have the correct length, return NULL.

[transfer none][array fixed-size=32][element-type guint8]

ostree_checksum_bytes_peek_validate ()

-
const guchar *
-ostree_checksum_bytes_peek_validate (GVariant *bytes,
-                                     GError **error);
+
const guchar *
+ostree_checksum_bytes_peek_validate (GVariant *bytes,
+                                     GError **error);

Like ostree_checksum_bytes_peek(), but also throws error .

@@ -839,7 +847,7 @@ ostree_checksum_bytes_peek_validate (

bytes

-

GVariant of type ay

+

GVariant of type ay

  @@ -860,7 +868,7 @@ ostree_checksum_bytes_peek_validate (

ostree_checksum_b64_from_bytes ()

char *
-ostree_checksum_b64_from_bytes (const guchar *csum);
+ostree_checksum_b64_from_bytes (const guchar *csum);

Parameters

@@ -889,7 +897,7 @@ character is used.

ostree_checksum_b64_to_bytes ()

-
guchar *
+
guchar *
 ostree_checksum_b64_to_bytes (const char *checksum);

 

 
Parameters

@@ -919,7 +927,7 @@ ostree_checksum_b64_to_bytes (const 
ostree_checksum_b64_inplace_from_bytes ()

 
void
 ostree_checksum_b64_inplace_from_bytes
-                               (const guchar *csum,
+                               (const guchar *csum,
                                 char *buf);

 
Overwrite the contents of buf
  with modified base64 encoding of csum
@@ -955,7 +963,7 @@ character is used.

 
ostree_checksum_b64_inplace_to_bytes ()

 
void
 ostree_checksum_b64_inplace_to_bytes (const char *checksum,
-                                      guint8 *buf);

+                                      guint8 *buf);

Overwrite the contents of buf with stringified version of csum .

@@ -987,8 +995,8 @@ ostree_checksum_b64_inplace_to_bytes (const

ostree_cmp_checksum_bytes ()

int
-ostree_cmp_checksum_bytes (const guchar *a,
-                           const guchar *b);
+ostree_cmp_checksum_bytes (const guchar *a, + const guchar *b);

Compare two binary checksums, using memcmp().

Parameters

@@ -1016,9 +1024,9 @@ ostree_cmp_checksum_bytes (const

ostree_validate_rev ()

-
gboolean
+
gboolean
 ostree_validate_rev (const char *rev,
-                     GError **error);

+                     GError **error);

Parameters

@@ -1043,16 +1051,16 @@ ostree_validate_rev (const char

Returns

-

TRUE if rev +

TRUE if rev is a valid ref string

ostree_validate_remote_name ()

-
gboolean
+
gboolean
 ostree_validate_remote_name (const char *remote_name,
-                             GError **error);

+                             GError **error);

Parameters

@@ -1077,7 +1085,7 @@ ostree_validate_remote_name (const

Returns

-

TRUE if remote_name +

TRUE if remote_name is a valid remote name

Since: 2017.8

@@ -1085,20 +1093,20 @@ is a valid remote name

ostree_parse_refspec ()

-
gboolean
+
gboolean
 ostree_parse_refspec (const char *refspec,
                       char **out_remote,
                       char **out_ref,
-                      GError **error);

+                      GError **error);

Split a refspec like gnome-ostree:gnome-ostree/buildmaster or just gnome-ostree/buildmaster into two parts. In the first case, out_remote will be set to gnome-ostree, and out_ref to gnome-ostree/buildmaster. In the second case (a local ref), out_remote - will be NULL, and out_ref + will be NULL, and out_ref -will be gnome-ostree/buildmaster. In both cases, TRUE will be returned.

+will be gnome-ostree/buildmaster. In both cases, TRUE will be returned.

Parameters

@@ -1116,7 +1124,7 @@ will be gnome-ostree/buildmaster. In both cases, +or NULL if the refspec refs to a local ref.

@@ -1134,7 +1142,7 @@ or

Returns

-

TRUE on successful parsing, FALSE otherwise

+

TRUE on successful parsing, FALSE otherwise

@@ -1185,9 +1193,9 @@ ostree_object_type_from_string (const

ostree_hash_object_name ()

-
guint
-ostree_hash_object_name (gconstpointer a);
-

Use this function with GHashTable and ostree_object_name_serialize().

+
guint
+ostree_hash_object_name (gconstpointer a);
+

Use this function with GHashTable and ostree_object_name_serialize().

Parameters

out_remote

Return location for the remote name, -or NULL if the refspec refs to a local ref.

[out][nullable][optional]
@@ -1198,7 +1206,7 @@ ostree_hash_object_name (

a

- +

A GVariant containing a serialized object

A GVariant containing a serialized object

  
@@ -1207,7 +1215,7 @@ ostree_hash_object_name (

ostree_object_name_serialize ()

-
GVariant *
+
GVariant *
 ostree_object_name_serialize (const char *checksum,
                               OstreeObjectType objtype);

 

@@ -1234,7 +1242,7 @@ ostree_object_name_serialize (const 
 
Returns

-
A new floating GVariant containing checksum string and objtype. 

+
A new floating GVariant containing checksum string and objtype. 

 
[transfer floating]
@@ -1242,7 +1250,7 @@ ostree_object_name_serialize (const

ostree_object_name_deserialize ()

void
-ostree_object_name_deserialize (GVariant *variant,
+ostree_object_name_deserialize (GVariant *variant,
                                 const char **out_checksum,
                                 OstreeObjectType *out_objtype);

Reverse ostree_object_name_serialize(). Note that out_checksum @@ -1260,7 +1268,7 @@ only valid for the lifetime of variant

variant

-

A GVariant of type (su)

+

A GVariant of type (su)

  @@ -1318,7 +1326,7 @@ and a stringifed version of objtype

ostree_object_from_string ()

void
 ostree_object_from_string (const char *str,
-                           gchar **out_checksum,
+                           gchar **out_checksum,
                            OstreeObjectType *out_objtype);

Reverse ostree_object_to_string().

@@ -1352,16 +1360,16 @@ ostree_object_from_string (const

ostree_content_stream_parse ()

-
gboolean
-ostree_content_stream_parse (gboolean compressed,
-                             GInputStream *input,
-                             guint64 input_length,
-                             gboolean trusted,
-                             GInputStream **out_input,
-                             GFileInfo **out_file_info,
-                             GVariant **out_xattrs,
-                             GCancellable *cancellable,
-                             GError **error);
+
gboolean
+ostree_content_stream_parse (gboolean compressed,
+                             GInputStream *input,
+                             guint64 input_length,
+                             gboolean trusted,
+                             GInputStream **out_input,
+                             GFileInfo **out_file_info,
+                             GVariant **out_xattrs,
+                             GCancellable *cancellable,
+                             GError **error);

The reverse of ostree_raw_file_to_content_stream(); this function converts an object content stream back into components.

@@ -1390,7 +1398,7 @@ converts an object content stream back into components.

trusted

-

If TRUE, assume the content has been validated

+

If TRUE, assume the content has been validated

  @@ -1425,15 +1433,15 @@ converts an object content stream back into components.

ostree_content_file_parse ()

-
gboolean
-ostree_content_file_parse (gboolean compressed,
-                           GFile *content_path,
-                           gboolean trusted,
-                           GInputStream **out_input,
-                           GFileInfo **out_file_info,
-                           GVariant **out_xattrs,
-                           GCancellable *cancellable,
-                           GError **error);
+
gboolean
+ostree_content_file_parse (gboolean compressed,
+                           GFile *content_path,
+                           gboolean trusted,
+                           GInputStream **out_input,
+                           GFileInfo **out_file_info,
+                           GVariant **out_xattrs,
+                           GCancellable *cancellable,
+                           GError **error);

A thin wrapper for ostree_content_stream_parse(); this function converts an object content stream back into components.

@@ -1457,7 +1465,7 @@ converts an object content stream back into components.

trusted

-

If TRUE, assume the content has been validated

+

If TRUE, assume the content has been validated

  @@ -1492,16 +1500,16 @@ converts an object content stream back into components.

ostree_content_file_parse_at ()

-
gboolean
-ostree_content_file_parse_at (gboolean compressed,
+
gboolean
+ostree_content_file_parse_at (gboolean compressed,
                               int parent_dfd,
                               const char *path,
-                              gboolean trusted,
-                              GInputStream **out_input,
-                              GFileInfo **out_file_info,
-                              GVariant **out_xattrs,
-                              GCancellable *cancellable,
-                              GError **error);

+                              gboolean trusted,
+                              GInputStream **out_input,
+                              GFileInfo **out_file_info,
+                              GVariant **out_xattrs,
+                              GCancellable *cancellable,
+                              GError **error);

A thin wrapper for ostree_content_stream_parse(); this function converts an object content stream back into components.

@@ -1530,7 +1538,7 @@ converts an object content stream back into components.

trusted

-

If TRUE, assume the content has been validated

+

If TRUE, assume the content has been validated

  @@ -1565,13 +1573,13 @@ converts an object content stream back into components.

ostree_raw_file_to_archive_z2_stream ()

-
gboolean
-ostree_raw_file_to_archive_z2_stream (GInputStream *input,
-                                      GFileInfo *file_info,
-                                      GVariant *xattrs,
-                                      GInputStream **out_input,
-                                      GCancellable *cancellable,
-                                      GError **error);
+
gboolean
+ostree_raw_file_to_archive_z2_stream (GInputStream *input,
+                                      GFileInfo *file_info,
+                                      GVariant *xattrs,
+                                      GInputStream **out_input,
+                                      GCancellable *cancellable,
+                                      GError **error);

Convert from a "bare" file representation into an OSTREE_OBJECT_TYPE_FILE stream suitable for ostree pull.

@@ -1621,15 +1629,15 @@ OSTREE_OBJECT_TYPE_FILE stream suitable for ostree pull.

ostree_raw_file_to_archive_z2_stream_with_options ()

-
gboolean
+
gboolean
 ostree_raw_file_to_archive_z2_stream_with_options
-                               (GInputStream *input,
-                                GFileInfo *file_info,
-                                GVariant *xattrs,
-                                GVariant *options,
-                                GInputStream **out_input,
-                                GCancellable *cancellable,
-                                GError **error);

+                               (GInputStream *input,
+                                GFileInfo *file_info,
+                                GVariant *xattrs,
+                                GVariant *options,
+                                GInputStream **out_input,
+                                GCancellable *cancellable,
+                                GError **error);

Like ostree_raw_file_to_archive_z2_stream(), but supports an extensible set of flags. The following flags are currently defined:

  • compression-level (i): Level of compression to use, 0–9, with 0 being @@ -1686,14 +1694,14 @@ the least compression, and <0 giving the default level (currently 6).

    • ostree_raw_file_to_content_stream ()

    -
    gboolean
-ostree_raw_file_to_content_stream (GInputStream *input,
-                                   GFileInfo *file_info,
-                                   GVariant *xattrs,
-                                   GInputStream **out_input,
-                                   guint64 *out_length,
-                                   GCancellable *cancellable,
-                                   GError **error);
    +
    gboolean
+ostree_raw_file_to_content_stream (GInputStream *input,
+                                   GFileInfo *file_info,
+                                   GVariant *xattrs,
+                                   GInputStream **out_input,
+                                   guint64 *out_length,
+                                   GCancellable *cancellable,
+                                   GError **error);

    Convert from a "bare" file representation into an OSTREE_OBJECT_TYPE_FILE stream. This is a fundamental operation for writing data to an OstreeRepo.

    @@ -1748,12 +1756,12 @@ for writing data to an

    ostree_break_hardlink ()

    -
    gboolean
+
    gboolean
 ostree_break_hardlink (int dfd,
                        const char *path,
-                       gboolean skip_xattrs,
-                       GCancellable *cancellable,
-                       GError **error);
    
+                       gboolean skip_xattrs,
+                       GCancellable *cancellable,
+                       GError **error);

    In many cases using libostree, a program may need to "break" hardlinks by performing a copy. For example, in order to logically append to a file.

    @@ -1803,14 +1811,14 @@ care of synchronization.

    ostree_checksum_file_from_input ()

    -
    gboolean
-ostree_checksum_file_from_input (GFileInfo *file_info,
-                                 GVariant *xattrs,
-                                 GInputStream *in,
+
    gboolean
+ostree_checksum_file_from_input (GFileInfo *file_info,
+                                 GVariant *xattrs,
+                                 GInputStream *in,
                                  OstreeObjectType objtype,
-                                 guchar **out_csum,
-                                 GCancellable *cancellable,
-                                 GError **error);
    
+                                 guchar **out_csum,
+                                 GCancellable *cancellable,
+                                 GError **error);

    Compute the OSTree checksum for a given input.

    Parameters

    @@ -1833,7 +1841,7 @@ ostree_checksum_file_from_input (

    in

    -

    File content, should be NULL for symbolic links.

    +

    File content, should be NULL for symbolic links.

    [allow-none] @@ -1863,12 +1871,12 @@ ostree_checksum_file_from_input (

    ostree_checksum_file ()

    -
    gboolean
-ostree_checksum_file (GFile *f,
+
    gboolean
+ostree_checksum_file (GFile *f,
                       OstreeObjectType objtype,
-                      guchar **out_csum,
-                      GCancellable *cancellable,
-                      GError **error);
    
+                      guchar **out_csum,
+                      GCancellable *cancellable,
+                      GError **error);

    Compute the OSTree checksum for a given file.

    Parameters

    @@ -1911,15 +1919,15 @@ ostree_checksum_file (

    ostree_checksum_file_at ()

    -
    gboolean
+
    gboolean
 ostree_checksum_file_at (int dfd,
                          const char *path,
                          struct stat *stbuf,
                          OstreeObjectType objtype,
                          OstreeChecksumFlags flags,
                          char **out_checksum,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);

    Compute the OSTree checksum for a given file. This is an fd-relative version of ostree_checksum_file() which also takes flags and fills in a caller allocated buffer.

    @@ -1981,12 +1989,12 @@ allocated buffer.

    ostree_checksum_file_async ()

    void
-ostree_checksum_file_async (GFile *f,
+ostree_checksum_file_async (GFile *f,
                             OstreeObjectType objtype,
                             int io_priority,
-                            GCancellable *cancellable,
-                            GAsyncReadyCallback callback,
-                            gpointer user_data);
    + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

    Asynchronously compute the OSTree checksum for a given file; complete with ostree_checksum_file_async_finish().

    @@ -2036,11 +2044,11 @@ complete with

    ostree_checksum_file_async_finish ()

    -
    gboolean
-ostree_checksum_file_async_finish (GFile *f,
-                                   GAsyncResult *result,
-                                   guchar **out_csum,
-                                   GError **error);
    +
    gboolean
+ostree_checksum_file_async_finish (GFile *f,
+                                   GAsyncResult *result,
+                                   guchar **out_csum,
+                                   GError **error);

    Finish computing the OSTree checksum for a given file; see ostree_checksum_file_async().

    @@ -2079,9 +2087,9 @@ ostree_checksum_file_async_finish (

    ostree_create_directory_metadata ()

    -
    GVariant *
-ostree_create_directory_metadata (GFileInfo *dir_info,
-                                  GVariant *xattrs);
    +
    GVariant *
+ostree_create_directory_metadata (GFileInfo *dir_info,
+                                  GVariant *xattrs);

    Parameters

    @@ -2093,7 +2101,7 @@ ostree_create_directory_metadata (

    dir_info

    -     + @@ -2106,16 +2114,16 @@ ostree_create_directory_metadata (

    Returns

    -

    A new GVariant containing OSTREE_OBJECT_TYPE_DIR_META.

    +

    A new GVariant containing OSTREE_OBJECT_TYPE_DIR_META.

    [transfer full]

    ostree_validate_structureof_objtype ()

    -
    gboolean
-ostree_validate_structureof_objtype (guchar objtype,
-                                     GError **error);
    +
    gboolean
+ostree_validate_structureof_objtype (guchar objtype,
+                                     GError **error);

    Parameters

    a GFileInfo containing directory information

    a GFileInfo containing directory information

    		  
    @@ -2133,16 +2141,16 @@ ostree_validate_structureof_objtype (

    Returns

    -

    TRUE if objtype +

    TRUE if objtype represents a valid object type

    ostree_validate_structureof_csum_v ()

    -
    gboolean
-ostree_validate_structureof_csum_v (GVariant *checksum,
-                                    GError **error);
    +
    gboolean
+ostree_validate_structureof_csum_v (GVariant *checksum,
+                                    GError **error);

    Parameters

    @@ -2154,7 +2162,7 @@ ostree_validate_structureof_csum_v (

    checksum

    -     + @@ -2167,17 +2175,17 @@ ostree_validate_structureof_csum_v (

    Returns

    -

    TRUE if checksum +

    TRUE if checksum is a valid binary SHA256 checksum

    ostree_validate_structureof_checksum_string ()

    -
    gboolean
+
    gboolean
 ostree_validate_structureof_checksum_string
                                (const char *checksum,
-                                GError **error);
    
+                                GError **error);

    Parameters

    a GVariant of type "ay"

    a GVariant of type "ay"

    		  
    @@ -2202,16 +2210,16 @@ ostree_validate_structureof_checksum_string

    Returns

    -

    TRUE if checksum +

    TRUE if checksum is a valid ASCII SHA256 checksum

    ostree_validate_structureof_file_mode ()

    -
    gboolean
-ostree_validate_structureof_file_mode (guint32 mode,
-                                       GError **error);
    +
    gboolean
+ostree_validate_structureof_file_mode (guint32 mode,
+                                       GError **error);

    Parameters

    @@ -2236,16 +2244,16 @@ ostree_validate_structureof_file_mode (

    Returns

    -

    TRUE if mode +

    TRUE if mode represents a valid file type and permissions

    ostree_validate_structureof_commit ()

    -
    gboolean
-ostree_validate_structureof_commit (GVariant *commit,
-                                    GError **error);
    +
    gboolean
+ostree_validate_structureof_commit (GVariant *commit,
+                                    GError **error);

    Use this to validate the basic structure of commit , independent of any other objects it references.

    @@ -2273,16 +2281,16 @@ any other objects it references.

    Returns

    -

    TRUE if commit +

    TRUE if commit is structurally valid

    ostree_validate_structureof_dirtree ()

    -
    gboolean
-ostree_validate_structureof_dirtree (GVariant *dirtree,
-                                     GError **error);
    +
    gboolean
+ostree_validate_structureof_dirtree (GVariant *dirtree,
+                                     GError **error);

    Use this to validate the basic structure of dirtree , independent of any other objects it references.

    @@ -2310,16 +2318,16 @@ any other objects it references.

    Returns

    -

    TRUE if dirtree +

    TRUE if dirtree is structurally valid

    ostree_validate_structureof_dirmeta ()

    -
    gboolean
-ostree_validate_structureof_dirmeta (GVariant *dirmeta,
-                                     GError **error);
    +
    gboolean
+ostree_validate_structureof_dirmeta (GVariant *dirmeta,
+                                     GError **error);

    Use this to validate the basic structure of dirmeta .

    @@ -2346,15 +2354,15 @@ ostree_validate_structureof_dirmeta (

    Returns

    -

    TRUE if dirmeta +

    TRUE if dirmeta is structurally valid

    ostree_commit_get_parent ()

    -
    gchar *
-ostree_commit_get_parent (GVariant *commit_variant);
    +
    gchar *
+ostree_commit_get_parent (GVariant *commit_variant);

    Parameters

    @@ -2373,15 +2381,15 @@ ostree_commit_get_parent (

    Returns

    Checksum of the parent commit of commit_variant -, or NULL +, or NULL if none

    ostree_commit_get_timestamp ()

    -
    guint64
-ostree_commit_get_timestamp (GVariant *commit_variant);
    +
    guint64
+ostree_commit_get_timestamp (GVariant *commit_variant);

    Parameters

    @@ -2405,9 +2413,43 @@ ostree_commit_get_timestamp ( +

    ostree_commit_metadata_for_bootable ()

    +
    gboolean
+ostree_commit_metadata_for_bootable (GFile *root,
+                                     GVariantDict *dict,
+                                     GCancellable *cancellable,
+                                     GError **error);
    +

    Update provided dict + with standard metadata for bootable OSTree commits.

    +
    +

    Parameters

    +
    +++++ + + + + + + + + + + + + +

    root

    Root filesystem to be committed

    		 

    dict

    Dictionary to update

    		 
    +
    +

    Since: 2021.1

    +
    +
    +

    ostree_commit_get_content_checksum ()

    -
    gchar *
-ostree_commit_get_content_checksum (GVariant *commit_variant);
    +
    gchar *
+ostree_commit_get_content_checksum (GVariant *commit_variant);

    There are use cases where one wants a checksum just of the content of a commit. OSTree commits by default capture the current timestamp, and may have additional metadata, which means that re-committing identical content @@ -2434,7 +2476,7 @@ root "dirmeta" checksum (both in binary form, not hexadecimal).

    Returns

    -

    A SHA-256 hex string, or NULL if commit_variant +

    A SHA-256 hex string, or NULL if commit_variant is not well-formed.

    [nullable]

    @@ -2443,15 +2485,15 @@ is not well-formed.

    ostree_commit_get_object_sizes ()

    -
    gboolean
-ostree_commit_get_object_sizes (GVariant *commit_variant,
-                                GPtrArray **out_sizes_entries,
-                                GError **error);
    +
    gboolean
+ostree_commit_get_object_sizes (GVariant *commit_variant,
+                                GPtrArray **out_sizes_entries,
+                                GError **error);

    Reads a commit's "ostree.sizes" metadata and returns an array of OstreeCommitSizesEntry in out_sizes_entries . Each element represents an object in the commit. If the commit does not contain -the "ostree.sizes" metadata, a G_IO_ERROR_NOT_FOUND error will be +the "ostree.sizes" metadata, a G_IO_ERROR_NOT_FOUND error will be returned.

    Parameters

    @@ -2486,10 +2528,10 @@ returned.

    ostree_commit_sizes_entry_new ()

    OstreeCommitSizesEntry *
-ostree_commit_sizes_entry_new (const gchar *checksum,
+ostree_commit_sizes_entry_new (const gchar *checksum,
                                OstreeObjectType objtype,
-                               guint64 unpacked,
-                               guint64 archived);
    + guint64 unpacked, + guint64 archived);

    Create a new OstreeCommitSizesEntry for representing an object in a commit's "ostree.sizes" metadata.

    @@ -2588,9 +2630,9 @@ ostree_commit_sizes_entry_free (

    ostree_check_version ()

    -
    gboolean
-ostree_check_version (guint required_year,
-                      guint required_release);
    +
    gboolean
+ostree_check_version (guint required_year,
+                      guint required_release);

    Parameters

    @@ -2615,7 +2657,7 @@ ostree_check_version (

    Returns

    -

    TRUE if current libostree has at least the requested version, FALSE otherwise

    +

    TRUE if current libostree has at least the requested version, FALSE otherwise

    Since: 2017.4

    @@ -2843,7 +2885,7 @@ entry corresponds to an object in the associated commit.

     - + @@ -2853,12 +2895,12 @@ entry corresponds to an object in the associated commit.

     - + - + @@ -2870,6 +2912,6 @@ entry corresponds to an object in the associated commit.

    -
    Generated by GTK-Doc V1.33.0
    +
    Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/apidoc/html/ostree-GPG-signature-verification-results.html b/apidoc/html/ostree-GPG-signature-verification-results.html index 41a22950..82a957f5 100644 --- a/apidoc/html/ostree-GPG-signature-verification-results.html +++ b/apidoc/html/ostree-GPG-signature-verification-results.html @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@     +, or NULL.

    @@ -248,22 +248,22 @@ signed by key_id

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    ostree_gpg_verify_result_get ()

    -
    GVariant *
+
    GVariant *
 ostree_gpg_verify_result_get (OstreeGpgVerifyResult *result,
-                              guint signature_index,
+                              guint signature_index,
                               OstreeGpgSignatureAttr *attrs,
-                              guint n_attrs);
    
-
    Builds a GVariant tuple of requested attributes for the GPG signature at
+                              guint n_attrs);
    +

    Builds a GVariant tuple of requested attributes for the GPG signature at signature_index in result . See the OstreeGpgSignatureAttr description -for the GVariantType of each available attribute.

    +for the GVariantType of each available attribute.

    It is a programmer error to request an invalid OstreeGpgSignatureAttr or an invalid signature_index . Use ostree_gpg_verify_result_count_all() to @@ -304,29 +304,29 @@ array

    Returns

    -

    a new, floating, GVariant tuple

    +

    a new, floating, GVariant tuple

    ostree_gpg_verify_result_get_all ()

    -
    GVariant *
+
    GVariant *
 ostree_gpg_verify_result_get_all (OstreeGpgVerifyResult *result,
-                                  guint signature_index);
    
-
    Builds a GVariant tuple of all available attributes for the GPG signature
+                                  guint signature_index);
    +

    Builds a GVariant tuple of all available attributes for the GPG signature at signature_index in result .

    -

    The child values in the returned GVariant tuple are ordered to match the +

    The child values in the returned GVariant tuple are ordered to match the OstreeGpgSignatureAttr enumeration, which means the enum values can be -used as index values in functions like g_variant_get_child(). See the -OstreeGpgSignatureAttr description for the GVariantType of each +used as index values in functions like g_variant_get_child(). See the +OstreeGpgSignatureAttr description for the GVariantType of each available attribute.

    The OstreeGpgSignatureAttr enumeration may be extended in the future - with new attributes, which would affect the GVariant tuple returned by + with new attributes, which would affect the GVariant tuple returned by this function. While the position and type of current child values in - the GVariant tuple will not change, to avoid backward-compatibility + the GVariant tuple will not change, to avoid backward-compatibility issues please do not depend on the tuple's overall size or type signature.

    @@ -359,7 +359,7 @@ available attribute.

    Returns

    -

    a new, floating, GVariant tuple

    +

    a new, floating, GVariant tuple

    @@ -367,9 +367,9 @@ available attribute.

    ostree_gpg_verify_result_describe ()

    void
 ostree_gpg_verify_result_describe (OstreeGpgVerifyResult *result,
-                                   guint signature_index,
-                                   GString *output_buffer,
-                                   const gchar *line_prefix,
+                                   guint signature_index,
+                                   GString *output_buffer,
+                                   const gchar *line_prefix,
                                    OstreeGpgSignatureFormatFlags flags);

    Appends a brief, human-readable description of the GPG signature at signature_index @@ -408,7 +408,7 @@ format. Currently must be 0.

     - + @@ -430,11 +430,11 @@ format. Currently must be 0.

    ostree_gpg_verify_result_describe_variant ()

    void
 ostree_gpg_verify_result_describe_variant
-                               (GVariant *variant,
-                                GString *output_buffer,
-                                const gchar *line_prefix,
+                               (GVariant *variant,
+                                GString *output_buffer,
+                                const gchar *line_prefix,
                                 OstreeGpgSignatureFormatFlags flags);
    -

    Similar to ostree_gpg_verify_result_describe() but takes a GVariant of +

    Similar to ostree_gpg_verify_result_describe() but takes a GVariant of all attributes for a GPG signature instead of an OstreeGpgVerifyResult and signature index.

    The variant @@ -451,12 +451,12 @@ and signature index.

     - + - + @@ -476,14 +476,14 @@ and signature index.

    ostree_gpg_verify_result_require_valid_signature ()

    -
    gboolean
+
    gboolean
 ostree_gpg_verify_result_require_valid_signature
                                (OstreeGpgVerifyResult *result,
-                                GError **error);
    
+                                GError **error);

    Checks if the result contains at least one signature from the trusted keyring. You can call this function immediately after ostree_repo_verify_summary() or ostree_repo_verify_commit_ext() - -it will handle the NULL result +it will handle the NULL result and filled error too.

    @@ -502,7 +502,7 @@ it will handle the

    error

    -
     + @@ -510,9 +510,9 @@ it will handle the

    Returns

    -

    TRUE if result -was not NULL and had at least one -signature from trusted keyring, otherwise FALSE

    +

    TRUE if result +was not NULL and had at least one +signature from trusted keyring, otherwise FALSE

    Since: 2016.6

    @@ -592,7 +592,7 @@ sign it has been revoked. Since: 2020.1.

    enum OstreeGpgSignatureAttr

    Signature attributes available from an OstreeGpgVerifyResult. -The attribute's GVariantType is shown in brackets.

    +The attribute's GVariantType is shown in brackets.

    Members

    gchar *checksum;

    gchar *checksum;

    object checksum.

    		[not nullable]
     

    guint64 unpacked;

    guint64 unpacked;

    unpacked object size

    		  

    guint64 archived;

    guint64 archived;

    compressed object size

    		  
    -guint +guint ostree_gpg_verify_result_count_all () @@ -49,7 +49,7 @@
    -guint +guint ostree_gpg_verify_result_count_valid () @@ -57,7 +57,7 @@
    -gboolean +gboolean ostree_gpg_verify_result_lookup () @@ -65,7 +65,7 @@
    -GVariant * +GVariant * ostree_gpg_verify_result_get () @@ -73,7 +73,7 @@
    -GVariant * +GVariant * ostree_gpg_verify_result_get_all () @@ -97,7 +97,7 @@
    -gboolean +gboolean ostree_gpg_verify_result_require_valid_signature () @@ -150,7 +150,7 @@ or get all signature details with

    Functions

    ostree_gpg_verify_result_count_all ()

    -
    guint
+
    guint
 ostree_gpg_verify_result_count_all (OstreeGpgVerifyResult *result);
    
 
    Counts all the signatures in result
 .
    
@@ -177,7 +177,7 @@ ostree_gpg_verify_result_count_all (
 
    
 
    ostree_gpg_verify_result_count_valid ()
    
-
    guint
+
    guint
 ostree_gpg_verify_result_count_valid (OstreeGpgVerifyResult *result);
    
 
    Counts only the valid signatures in result
 .
    
@@ -204,17 +204,17 @@ ostree_gpg_verify_result_count_valid (
 
    ostree_gpg_verify_result_lookup ()
    
-
    gboolean
+
    gboolean
 ostree_gpg_verify_result_lookup (OstreeGpgVerifyResult *result,
-                                 const gchar *key_id,
-                                 guint *out_signature_index);
    
+                                 const gchar *key_id,
+                                 guint *out_signature_index);
    
 
    Searches result
  for a signature signed by key_id
 .  If a match is found,
-the function returns TRUE and sets out_signature_index
+the function returns TRUE and sets out_signature_index
  so that further
 signature details can be obtained through ostree_gpg_verify_result_get().
-If no match is found, the function returns FALSE and leaves
+If no match is found, the function returns FALSE and leaves
 out_signature_index
  unchanged.
    
 
    
@@ -240,7 +240,7 @@ If no match is found, the function returns 
    out_signature_index

    return location for the index of the signature signed by key_id -, or NULL.

    		[out]

    output_buffer

    a GString to hold the description

    a GString to hold the description

    		  

    variant

    a GVariant from ostree_gpg_verify_result_get_all()

    a GVariant from ostree_gpg_verify_result_get_all()

    		  

    output_buffer

    a GString to hold the description

    a GString to hold the description

    		  

    A GError

    A GError

    		  
    @@ -605,56 +605,56 @@ The attribute's

    OSTREE_GPG_SIGNATURE_ATTR_VALID

     @@ -662,7 +662,7 @@ expiration)

     @@ -670,7 +670,7 @@ the signature

     @@ -678,14 +678,14 @@ signature

     @@ -693,7 +693,7 @@ user

     @@ -711,7 +711,7 @@ expiration or if the key is missing)

     - + @@ -364,11 +364,11 @@ does not exist in the tree

    ostree_mutable_tree_ensure_dir ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_ensure_dir (OstreeMutableTree *self,
                                 const char *name,
                                 OstreeMutableTree **out_subdir,
-                                GError **error);
    
+                                GError **error);

    Returns the subdirectory of self with filename name , creating an empty one it if it doesn't exist.

    @@ -398,7 +398,7 @@ it if it doesn't exist.

     - + @@ -408,12 +408,12 @@ it if it doesn't exist.

    ostree_mutable_tree_lookup ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_lookup (OstreeMutableTree *self,
                             const char *name,
                             char **out_file_checksum,
                             OstreeMutableTree **out_subdir,
-                            GError **error);
    
+                            GError **error);

    Parameters

    -

    [G_VARIANT_TYPE_BOOLEAN] Is the signature valid?

    +

    [G_VARIANT_TYPE_BOOLEAN] Is the signature valid?

    		  

    OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED

    		 -

    [G_VARIANT_TYPE_BOOLEAN] Has the signature expired?

    +

    [G_VARIANT_TYPE_BOOLEAN] Has the signature expired?

    		  

    OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED

    		 -

    [G_VARIANT_TYPE_BOOLEAN] Has the signing key expired?

    +

    [G_VARIANT_TYPE_BOOLEAN] Has the signing key expired?

    		  

    OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED

    		 -

    [G_VARIANT_TYPE_BOOLEAN] Has the signing key been revoked?

    +

    [G_VARIANT_TYPE_BOOLEAN] Has the signing key been revoked?

    		  

    OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING

    		 -

    [G_VARIANT_TYPE_BOOLEAN] Is the signing key missing?

    +

    [G_VARIANT_TYPE_BOOLEAN] Is the signing key missing?

    		  

    OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT

    		 -

    [G_VARIANT_TYPE_STRING] Fingerprint of the signing key

    +

    [G_VARIANT_TYPE_STRING] Fingerprint of the signing key

    		  

    OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP

    		 -

    [G_VARIANT_TYPE_INT64] Signature creation Unix timestamp

    +

    [G_VARIANT_TYPE_INT64] Signature creation Unix timestamp

    		  

    OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP

    		 -

    [G_VARIANT_TYPE_INT64] Signature expiration Unix timestamp (0 if no +

    [G_VARIANT_TYPE_INT64] Signature expiration Unix timestamp (0 if no expiration)

    		  

    OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME

    		 -

    [G_VARIANT_TYPE_STRING] Name of the public key algorithm used to create +

    [G_VARIANT_TYPE_STRING] Name of the public key algorithm used to create the signature

    		  

    OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME

    		 -

    [G_VARIANT_TYPE_STRING] Name of the hash algorithm used to create the +

    [G_VARIANT_TYPE_STRING] Name of the hash algorithm used to create the signature

    		  

    OSTREE_GPG_SIGNATURE_ATTR_USER_NAME

    		 -

    [G_VARIANT_TYPE_STRING] The name of the signing key's primary user

    +

    [G_VARIANT_TYPE_STRING] The name of the signing key's primary user

    		  

    OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL

    		 -

    [G_VARIANT_TYPE_STRING] The email address of the signing key's primary +

    [G_VARIANT_TYPE_STRING] The email address of the signing key's primary user

    		  

    OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY

    		 -

    [G_VARIANT_TYPE_STRING] Fingerprint of the signing key's primary key +

    [G_VARIANT_TYPE_STRING] Fingerprint of the signing key's primary key (will be the same as OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT if the the signature is already from the primary key rather than a subkey, and will be the empty string if the key is missing.)

    @@ -703,7 +703,7 @@ and will be the empty string if the key is missing.)

    OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP

    		 -

    [G_VARIANT_TYPE_INT64] Key expiration Unix timestamp (0 if no +

    [G_VARIANT_TYPE_INT64] Key expiration Unix timestamp (0 if no expiration or if the key is missing)

    		  

    OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY

    		 -

    [G_VARIANT_TYPE_INT64] Key expiration Unix timestamp of the signing key's +

    [G_VARIANT_TYPE_INT64] Key expiration Unix timestamp of the signing key's primary key (will be the same as OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP if the signing key is the primary key and 0 if no expiration or if the key is missing)

    @@ -749,6 +749,6 @@ for future variations.

    -
    Generated by GTK-Doc V1.33.0
    +
    Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/apidoc/html/ostree-In-memory-modifiable-filesystem-tree.html b/apidoc/html/ostree-In-memory-modifiable-filesystem-tree.html index 7db5433b..67afe627 100644 --- a/apidoc/html/ostree-In-memory-modifiable-filesystem-tree.html +++ b/apidoc/html/ostree-In-memory-modifiable-filesystem-tree.html @@ -8,7 +8,7 @@ - + @@ -57,7 +57,7 @@
    -gboolean +gboolean ostree_mutable_tree_check_error () @@ -95,7 +95,7 @@
    -gboolean +gboolean ostree_mutable_tree_replace_file () @@ -103,7 +103,7 @@
    -gboolean +gboolean ostree_mutable_tree_remove () @@ -111,7 +111,7 @@
    -gboolean +gboolean ostree_mutable_tree_ensure_dir () @@ -119,7 +119,7 @@
    -gboolean +gboolean ostree_mutable_tree_lookup () @@ -127,7 +127,7 @@
    -gboolean +gboolean ostree_mutable_tree_ensure_parent_dirs () @@ -135,7 +135,7 @@
    -gboolean +gboolean ostree_mutable_tree_walk () @@ -143,7 +143,7 @@
    -GHashTable * +GHashTable * ostree_mutable_tree_get_subdirs () @@ -151,7 +151,7 @@
    -GHashTable * +GHashTable * ostree_mutable_tree_get_files () @@ -159,7 +159,7 @@
    -gboolean +gboolean ostree_mutable_tree_fill_empty_from_dirtree () @@ -247,9 +247,9 @@ and checksums. The data will be loaded from the repo lazily as needed.

    ostree_mutable_tree_check_error ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_check_error (OstreeMutableTree *self,
-                                 GError **error);
    
+                                 GError **error);

    In some cases, a tree may be in a "lazy" state that loads data in the background; if an error occurred during a non-throwing API call, it will have been cached. This function checks for a @@ -308,20 +308,20 @@ ostree_mutable_tree_get_contents_checksum

    ostree_mutable_tree_replace_file ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_replace_file (OstreeMutableTree *self,
                                   const char *name,
                                   const char *checksum,
-                                  GError **error);
    
+                                  GError **error);

    ostree_mutable_tree_remove ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_remove (OstreeMutableTree *self,
                             const char *name,
-                            gboolean allow_noent,
-                            GError **error);
    
+                            gboolean allow_noent,
+                            GError **error);

    Remove the file or subdirectory named name from the mutable tree self .

    @@ -353,7 +353,7 @@ does not exist in the tree

    error

    a GError

    a GError

    		  

    error

    a GError

    a GError

    		  
    @@ -445,7 +445,7 @@ ostree_mutable_tree_lookup (

    error

    -     + @@ -455,13 +455,13 @@ ostree_mutable_tree_lookup (

    ostree_mutable_tree_ensure_parent_dirs ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_ensure_parent_dirs
                                (OstreeMutableTree *self,
-                                GPtrArray *split_path,
+                                GPtrArray *split_path,
                                 const char *metadata_checksum,
                                 OstreeMutableTree **out_parent,
-                                GError **error);
    
+                                GError **error);

    Create all parent trees necessary for the given split_path to exist.

    @@ -496,7 +496,7 @@ exist.

     - + @@ -506,12 +506,12 @@ exist.

    ostree_mutable_tree_walk ()

    -
    gboolean
+
    gboolean
 ostree_mutable_tree_walk (OstreeMutableTree *self,
-                          GPtrArray *split_path,
-                          guint start,
+                          GPtrArray *split_path,
+                          guint start,
                           OstreeMutableTree **out_subdir,
-                          GError **error);
    
+                          GError **error);

    Traverse start number of elements starting from split_path ; the @@ -559,7 +559,7 @@ child will be returned in out_subdir

    ostree_mutable_tree_get_subdirs ()

    -
    GHashTable *
+
    GHashTable *
 ostree_mutable_tree_get_subdirs (OstreeMutableTree *self);
    
 
    
 
    Returns
    
@@ -570,7 +570,7 @@ ostree_mutable_tree_get_subdirs (
 
    
 
    ostree_mutable_tree_get_files ()
    
-
    GHashTable *
+
    GHashTable *
 ostree_mutable_tree_get_files (OstreeMutableTree *self);
    
 
    
 
    Returns
    
@@ -581,7 +581,7 @@ ostree_mutable_tree_get_files (
 
    
 
    ostree_mutable_tree_fill_empty_from_dirtree ()
    
-
    gboolean
+
    gboolean
 ostree_mutable_tree_fill_empty_from_dirtree
                                (OstreeMutableTree *self,
                                 OstreeRepo *repo,
@@ -622,6 +622,6 @@ the contents will be loaded only when needed.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
    
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-OstreeRepo.html b/apidoc/html/ostree-OstreeRepo.html
index 5062dd5c..420f24ed 100644
--- a/apidoc/html/ostree-OstreeRepo.html
+++ b/apidoc/html/ostree-OstreeRepo.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
    - - - + - + - + @@ -7898,12 +7898,12 @@ ostree_repo_sign_commit (

    ostree_repo_append_gpg_signature ()

    -
    gboolean
+
    gboolean
 ostree_repo_append_gpg_signature (OstreeRepo *self,
-                                  const gchar *commit_checksum,
-                                  GBytes *signature_bytes,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  const gchar *commit_checksum,
+                                  GBytes *signature_bytes,
+                                  GCancellable *cancellable,
+                                  GError **error);

    Append a GPG signature to a commit.

    Parameters

    @@ -7931,12 +7931,12 @@ ostree_repo_append_gpg_signature (
    - + - + @@ -7946,12 +7946,12 @@ ostree_repo_append_gpg_signature (

    ostree_repo_add_gpg_signature_summary ()

    -
    gboolean
+
    gboolean
 ostree_repo_add_gpg_signature_summary (OstreeRepo *self,
-                                       const gchar **key_id,
-                                       const gchar *homedir,
-                                       GCancellable *cancellable,
-                                       GError **error);
    
+                                       const gchar **key_id,
+                                       const gchar *homedir,
+                                       GCancellable *cancellable,
+                                       GError **error);

    Add a GPG signature to a summary file.

    Parameters

    @@ -7974,17 +7974,17 @@ ostree_repo_add_gpg_signature_summary (

    homedir

    -
     + - + - + @@ -7994,15 +7994,15 @@ ostree_repo_add_gpg_signature_summary (

    ostree_repo_gpg_sign_data ()

    -
    gboolean
+
    gboolean
 ostree_repo_gpg_sign_data (OstreeRepo *self,
-                           GBytes *data,
-                           GBytes *old_signatures,
-                           const gchar **key_id,
-                           const gchar *homedir,
-                           GBytes **out_signatures,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GBytes *data,
+                           GBytes *old_signatures,
+                           const gchar **key_id,
+                           const gchar *homedir,
+                           GBytes **out_signatures,
+                           GCancellable *cancellable,
+                           GError **error);

    Sign the given data with the specified keys in key_id . Similar to @@ -8025,12 +8025,12 @@ data.

     - + - + @@ -8040,7 +8040,7 @@ data.

     - + @@ -8050,12 +8050,12 @@ data.

     - + - + @@ -8077,20 +8077,20 @@ will contain the reason).

    ostree_repo_gpg_verify_data ()

    OstreeGpgVerifyResult *
 ostree_repo_gpg_verify_data (OstreeRepo *self,
-                             const gchar *remote_name,
-                             GBytes *data,
-                             GBytes *signatures,
-                             GFile *keyringdir,
-                             GFile *extra_keyring,
-                             GCancellable *cancellable,
-                             GError **error);
    + const gchar *remote_name, + GBytes *data, + GBytes *signatures, + GFile *keyringdir, + GFile *extra_keyring, + GCancellable *cancellable, + GError **error);

    Verify signatures for data using GPG keys in the keyring for remote_name , and return an OstreeGpgVerifyResult.

    The remote_name - parameter can be NULL. In that case it will do + parameter can be NULL. In that case it will do the verifications using GPG keys in the keyrings of all remotes.

    Parameters

    @@ -8113,12 +8113,12 @@ the verifications using GPG keys in the keyrings of all remotes.

     - + - + @@ -8146,7 +8146,7 @@ the verifications using GPG keys in the keyrings of all remotes.

    Returns

    -

    an OstreeGpgVerifyResult, or NULL on error.

    +

    an OstreeGpgVerifyResult, or NULL on error.

    [transfer full]

    Since: 2016.6

    @@ -8154,13 +8154,13 @@ the verifications using GPG keys in the keyrings of all remotes.

    ostree_repo_verify_commit ()

    -
    gboolean
+
    gboolean
 ostree_repo_verify_commit (OstreeRepo *self,
-                           const gchar *commit_checksum,
-                           GFile *keyringdir,
-                           GFile *extra_keyring,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           const gchar *commit_checksum,
+                           GFile *keyringdir,
+                           GFile *extra_keyring,
+                           GCancellable *cancellable,
+                           GError **error);

    Check for a valid GPG signature on commit named by the ASCII checksum commit_checksum .

    @@ -8208,7 +8208,7 @@ checksum commit_checksum

    Returns

    -

    TRUE if there was a GPG signature from a trusted keyring, otherwise FALSE

    +

    TRUE if there was a GPG signature from a trusted keyring, otherwise FALSE

    @@ -8216,11 +8216,11 @@ checksum commit_checksum

    ostree_repo_verify_commit_ext ()

    OstreeGpgVerifyResult *
 ostree_repo_verify_commit_ext (OstreeRepo *self,
-                               const gchar *commit_checksum,
-                               GFile *keyringdir,
-                               GFile *extra_keyring,
-                               GCancellable *cancellable,
-                               GError **error);
    + const gchar *commit_checksum, + GFile *keyringdir, + GFile *extra_keyring, + GCancellable *cancellable, + GError **error);

    Read GPG signature(s) on the commit named by the ASCII checksum commit_checksum and return detailed results.

    @@ -8268,7 +8268,7 @@ ostree_repo_verify_commit_ext (

    Returns

    -

    an OstreeGpgVerifyResult, or NULL on error.

    +

    an OstreeGpgVerifyResult, or NULL on error.

    [transfer full]

    @@ -8277,10 +8277,10 @@ ostree_repo_verify_commit_ext (

    ostree_repo_verify_commit_for_remote ()

    OstreeGpgVerifyResult *
 ostree_repo_verify_commit_for_remote (OstreeRepo *self,
-                                      const gchar *commit_checksum,
-                                      const gchar *remote_name,
-                                      GCancellable *cancellable,
-                                      GError **error);
    + const gchar *commit_checksum, + const gchar *remote_name, + GCancellable *cancellable, + GError **error);

    Read GPG signature(s) on the commit named by the ASCII checksum commit_checksum and return detailed results, based on the keyring @@ -8325,7 +8325,7 @@ configured for remote

    Returns

    -

    an OstreeGpgVerifyResult, or NULL on error.

    +

    an OstreeGpgVerifyResult, or NULL on error.

    [transfer full]

    Since: 2016.14

    @@ -8336,10 +8336,10 @@ configured for remote 
    OstreeGpgVerifyResult *
 ostree_repo_verify_summary (OstreeRepo *self,
                             const char *remote_name,
-                            GBytes *summary,
-                            GBytes *signatures,
-                            GCancellable *cancellable,
-                            GError **error);
    + GBytes *summary, + GBytes *signatures, + GCancellable *cancellable, + GError **error);

    Verify signatures for summary data using GPG keys in the keyring for @@ -8366,12 +8366,12 @@ ostree_repo_verify_summary (

    summary

    -     + - + @@ -8389,18 +8389,18 @@ ostree_repo_verify_summary (

    Returns

    -

    an OstreeGpgVerifyResult, or NULL on error.

    +

    an OstreeGpgVerifyResult, or NULL on error.

    [transfer full]

    ostree_repo_regenerate_summary ()

    -
    gboolean
+
    gboolean
 ostree_repo_regenerate_summary (OstreeRepo *self,
-                                GVariant *additional_metadata,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GVariant *additional_metadata,
+                                GCancellable *cancellable,
+                                GError **error);

    An OSTree repository can contain a high level "summary" file that describes the available branches and other metadata.

    If the timetable for making commits and updating the summary file is fairly @@ -8432,7 +8432,7 @@ lexicographic order.

     - + @@ -8591,57 +8591,57 @@ interesting for reporting purposes.

     - + - + - + - + - + - + - + - + - + - + @@ -9026,7 +9026,7 @@ supercedes previous separate enumeration usage in

    OSTREE_REPO_LIST_OBJECTS_VARIANT_TYPE

    #define OSTREE_REPO_LIST_OBJECTS_VARIANT_TYPE (G_VARIANT_TYPE ("(bas)")
    -

    b - TRUE if object is available "loose" +

    b - TRUE if object is available "loose" as - List of pack file checksums in which this object appears

    @@ -9213,6 +9213,6 @@ as - List of pack file checksums in which this object appears

    -
    Generated by GTK-Doc V1.33.0
    +
    Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/apidoc/html/ostree-Progress-notification-system-for-asynchronous-operations.html b/apidoc/html/ostree-Progress-notification-system-for-asynchronous-operations.html index 338dd787..ea4de364 100644 --- a/apidoc/html/ostree-Progress-notification-system-for-asynchronous-operations.html +++ b/apidoc/html/ostree-Progress-notification-system-for-asynchronous-operations.html @@ -8,7 +8,7 @@ - + @@ -81,7 +81,7 @@

    a GError

    a GError

    		  

    error

    a GError

    a GError

    		  
    -gboolean +gboolean ostree_repo_mode_from_string () @@ -81,7 +81,7 @@
    -gboolean +gboolean ostree_repo_open () @@ -97,7 +97,7 @@
    -gboolean +gboolean ostree_repo_get_disable_fsync () @@ -105,7 +105,7 @@
    -gboolean +gboolean ostree_repo_is_system () @@ -113,7 +113,7 @@
    -gboolean +gboolean ostree_repo_is_writable () @@ -129,14 +129,14 @@
    -gboolean +gboolean ostree_repo_create ()
    const gchar * +const gchar * ostree_repo_get_bootloader () @@ -144,7 +144,7 @@
    -GFile * +GFile * ostree_repo_get_path () @@ -160,7 +160,7 @@
    -gboolean +gboolean ostree_repo_get_min_free_space_bytes () @@ -168,7 +168,7 @@
    -GKeyFile * +GKeyFile * ostree_repo_get_config () @@ -183,7 +183,7 @@
    const gchar * const * +const gchar * const * ostree_repo_get_default_repo_finders () @@ -191,7 +191,7 @@
    -guint +guint ostree_repo_hash () @@ -199,7 +199,7 @@
    -gboolean +gboolean ostree_repo_equal () @@ -207,7 +207,7 @@
    -GKeyFile * +GKeyFile * ostree_repo_copy_config () @@ -215,7 +215,7 @@
    -gboolean +gboolean ostree_repo_remote_add () @@ -223,7 +223,7 @@
    -gboolean +gboolean ostree_repo_remote_delete () @@ -231,7 +231,7 @@
    -gboolean +gboolean ostree_repo_remote_change () @@ -247,7 +247,7 @@
    -gboolean +gboolean ostree_repo_remote_get_url () @@ -255,7 +255,7 @@
    -gboolean +gboolean ostree_repo_remote_get_gpg_verify () @@ -263,7 +263,7 @@
    -gboolean +gboolean ostree_repo_remote_get_gpg_verify_summary () @@ -271,7 +271,7 @@
    -gboolean +gboolean ostree_repo_remote_gpg_import () @@ -279,7 +279,7 @@
    -gboolean +gboolean ostree_repo_remote_fetch_summary () @@ -287,7 +287,7 @@
    -gboolean +gboolean ostree_repo_remote_fetch_summary_with_options () @@ -295,7 +295,7 @@
    -gboolean +gboolean ostree_repo_reload_config () @@ -303,7 +303,7 @@
    -gboolean +gboolean ostree_repo_get_remote_boolean_option () @@ -311,7 +311,7 @@
    -gboolean +gboolean ostree_repo_get_remote_list_option () @@ -319,7 +319,7 @@
    -gboolean +gboolean ostree_repo_get_remote_option () @@ -335,7 +335,7 @@
    -gboolean +gboolean ostree_repo_write_config () @@ -343,7 +343,7 @@
    -gboolean +gboolean ostree_repo_scan_hardlinks () @@ -351,7 +351,7 @@
    -gboolean +gboolean ostree_repo_prepare_transaction () @@ -359,7 +359,7 @@
    -gboolean +gboolean ostree_repo_commit_transaction () @@ -367,7 +367,7 @@
    -gboolean +gboolean ostree_repo_abort_transaction () @@ -391,7 +391,7 @@
    -gboolean +gboolean ostree_repo_set_ref_immediate () @@ -399,7 +399,7 @@
    -gboolean +gboolean ostree_repo_set_alias_ref_immediate () @@ -407,7 +407,7 @@
    -gboolean +gboolean ostree_repo_set_cache_dir () @@ -415,7 +415,7 @@
    -gboolean +gboolean ostree_repo_sign_delta () @@ -423,7 +423,7 @@
    -gboolean +gboolean ostree_repo_has_object () @@ -431,7 +431,7 @@
    -gboolean +gboolean ostree_repo_mark_commit_partial () @@ -439,7 +439,7 @@
    -gboolean +gboolean ostree_repo_mark_commit_partial_reason () @@ -447,7 +447,7 @@
    -gboolean +gboolean ostree_repo_write_metadata () @@ -463,7 +463,7 @@
    -gboolean +gboolean ostree_repo_write_metadata_finish () @@ -471,7 +471,7 @@
    -gboolean +gboolean ostree_repo_write_content () @@ -479,7 +479,7 @@
    -gboolean +gboolean ostree_repo_write_metadata_trusted () @@ -487,7 +487,7 @@
    -gboolean +gboolean ostree_repo_write_metadata_stream_trusted () @@ -495,7 +495,7 @@
    -gboolean +gboolean ostree_repo_write_content_trusted () @@ -511,7 +511,7 @@
    -gboolean +gboolean ostree_repo_write_content_finish () @@ -519,7 +519,7 @@
    -gboolean +gboolean ostree_repo_resolve_rev () @@ -527,7 +527,7 @@
    -gboolean +gboolean ostree_repo_resolve_rev_ext () @@ -535,7 +535,7 @@
    -gboolean +gboolean ostree_repo_list_refs () @@ -543,7 +543,7 @@
    -gboolean +gboolean ostree_repo_list_refs_ext () @@ -551,7 +551,7 @@
    -gboolean +gboolean ostree_repo_remote_list_refs () @@ -559,7 +559,7 @@
    -gboolean +gboolean ostree_repo_load_variant () @@ -567,7 +567,7 @@
    -gboolean +gboolean ostree_repo_load_commit () @@ -575,7 +575,7 @@
    -gboolean +gboolean ostree_repo_load_variant_if_exists () @@ -583,7 +583,7 @@
    -gboolean +gboolean ostree_repo_load_file () @@ -591,7 +591,7 @@
    -gboolean +gboolean ostree_repo_load_object_stream () @@ -599,7 +599,7 @@
    -gboolean +gboolean ostree_repo_query_object_storage_size () @@ -607,7 +607,7 @@
    -gboolean +gboolean ostree_repo_import_object_from () @@ -615,7 +615,7 @@
    -gboolean +gboolean ostree_repo_import_object_from_with_trust () @@ -623,7 +623,7 @@
    -gboolean +gboolean ostree_repo_import_archive_to_mtree () @@ -631,7 +631,7 @@
    -gboolean +gboolean ostree_repo_export_tree_to_archive () @@ -639,7 +639,7 @@
    -gboolean +gboolean ostree_repo_delete_object () @@ -647,7 +647,7 @@
    -gboolean +gboolean ostree_repo_fsck_object () @@ -671,7 +671,7 @@
    -GVariant * +GVariant * (*OstreeRepoCommitModifierXattrCallback) () @@ -695,7 +695,7 @@
    -gboolean +gboolean ostree_repo_commit_modifier_set_sepolicy_from_commit () @@ -751,7 +751,7 @@
    -GType +GType ostree_repo_devino_cache_get_type () @@ -759,7 +759,7 @@
    -gboolean +gboolean ostree_repo_write_directory_to_mtree () @@ -767,7 +767,7 @@
    -gboolean +gboolean ostree_repo_write_dfd_to_mtree () @@ -775,7 +775,7 @@
    -gboolean +gboolean ostree_repo_write_archive_to_mtree () @@ -783,7 +783,7 @@
    -gboolean +gboolean ostree_repo_write_archive_to_mtree_from_fd () @@ -791,7 +791,7 @@
    -gboolean +gboolean ostree_repo_write_mtree () @@ -799,7 +799,7 @@
    -gboolean +gboolean ostree_repo_write_commit () @@ -807,7 +807,7 @@
    -gboolean +gboolean ostree_repo_write_commit_with_time () @@ -815,7 +815,7 @@
    -gboolean +gboolean ostree_repo_read_commit_detached_metadata () @@ -823,7 +823,7 @@
    -gboolean +gboolean ostree_repo_write_commit_detached_metadata () @@ -839,7 +839,7 @@
    -gboolean +gboolean ostree_repo_checkout_tree () @@ -847,7 +847,7 @@
    -gboolean +gboolean ostree_repo_checkout_tree_at () @@ -855,7 +855,7 @@
    -gboolean +gboolean ostree_repo_checkout_at () @@ -863,7 +863,7 @@
    -gboolean +gboolean ostree_repo_checkout_gc () @@ -871,7 +871,7 @@
    -gboolean +gboolean ostree_repo_read_commit () @@ -879,7 +879,7 @@
    -gboolean +gboolean ostree_repo_list_objects () @@ -887,7 +887,7 @@
    -gboolean +gboolean ostree_repo_list_commit_objects_starting_with () @@ -895,7 +895,7 @@
    -gboolean +gboolean ostree_repo_list_static_delta_names () @@ -903,7 +903,7 @@
    -gboolean +gboolean ostree_repo_list_static_delta_indexes () @@ -911,7 +911,7 @@
    -gboolean +gboolean ostree_repo_static_delta_reindex () @@ -919,7 +919,7 @@
    -gboolean +gboolean ostree_repo_static_delta_generate () @@ -927,7 +927,7 @@
    -gboolean +gboolean ostree_repo_static_delta_execute_offline_with_signature () @@ -935,7 +935,7 @@
    -gboolean +gboolean ostree_repo_static_delta_execute_offline () @@ -943,7 +943,7 @@
    -gboolean +gboolean ostree_repo_static_delta_verify_signature () @@ -951,7 +951,7 @@
    -GHashTable * +GHashTable * ostree_repo_traverse_new_reachable () @@ -959,7 +959,7 @@
    -GHashTable * +GHashTable * ostree_repo_traverse_new_parents () @@ -975,7 +975,7 @@
    -gboolean +gboolean ostree_repo_traverse_commit () @@ -983,7 +983,7 @@
    -gboolean +gboolean ostree_repo_traverse_commit_union () @@ -991,7 +991,7 @@
    -gboolean +gboolean ostree_repo_traverse_commit_union_with_parents () @@ -1031,7 +1031,7 @@
    -gboolean +gboolean ostree_repo_commit_traverse_iter_init_commit () @@ -1039,7 +1039,7 @@
    -gboolean +gboolean ostree_repo_commit_traverse_iter_init_dirtree () @@ -1055,7 +1055,7 @@
    -gboolean +gboolean ostree_repo_prune () @@ -1063,7 +1063,7 @@
    -gboolean +gboolean ostree_repo_prune_static_deltas () @@ -1071,7 +1071,7 @@
    -gboolean +gboolean ostree_repo_traverse_reachable_refs () @@ -1079,7 +1079,7 @@
    -gboolean +gboolean ostree_repo_prune_from_reachable () @@ -1087,7 +1087,7 @@
    -gboolean +gboolean ostree_repo_pull () @@ -1095,7 +1095,7 @@
    -gboolean +gboolean ostree_repo_pull_one_dir () @@ -1103,7 +1103,7 @@
    -gboolean +gboolean ostree_repo_pull_with_options () @@ -1119,7 +1119,7 @@
    -gboolean +gboolean ostree_repo_sign_commit () @@ -1127,7 +1127,7 @@
    -gboolean +gboolean ostree_repo_append_gpg_signature () @@ -1135,7 +1135,7 @@
    -gboolean +gboolean ostree_repo_add_gpg_signature_summary () @@ -1143,7 +1143,7 @@
    -gboolean +gboolean ostree_repo_gpg_sign_data () @@ -1159,7 +1159,7 @@
    -gboolean +gboolean ostree_repo_verify_commit () @@ -1191,7 +1191,7 @@
    -gboolean +gboolean ostree_repo_regenerate_summary () @@ -1339,10 +1339,10 @@ collection IDs, see ostree_validate_collection_id()

    Functions

    ostree_repo_mode_from_string ()

    -
    gboolean
+
    gboolean
 ostree_repo_mode_from_string (const char *mode,
                               OstreeRepoMode *out_mode,
-                              GError **error);
    
+                              GError **error);

    Parameters

    @@ -1364,7 +1364,7 @@ ostree_repo_mode_from_string (const

    error

    -     + @@ -1377,8 +1377,8 @@ ostree_repo_mode_from_string (const OstreeRepo * ostree_repo_open_at (int dfd, const char *path, - GCancellable *cancellable, - GError **error); + GCancellable *cancellable, + GError **error);

    This combines ostree_repo_new() (but using fd-relative access) with ostree_repo_open(). Use this when you know you should be operating on an already extant repository. If you want to create one, use ostree_repo_create_at().

    @@ -1417,7 +1417,7 @@ already extant repository. If you want to create one, use

    ostree_repo_new ()

    OstreeRepo *
-ostree_repo_new (GFile *path);
    +ostree_repo_new (GFile *path);

    Parameters

    a GError if the string is not a valid mode

    a GError if the string is not a valid mode

    		  
    @@ -1444,8 +1444,8 @@ ostree_repo_new (

    ostree_repo_new_for_sysroot_path ()

    OstreeRepo *
-ostree_repo_new_for_sysroot_path (GFile *repo_path,
-                                  GFile *sysroot_path);
    +ostree_repo_new_for_sysroot_path (GFile *repo_path, + GFile *sysroot_path);

    Creates a new OstreeRepo instance, taking the system root path explicitly instead of assuming "/".

    @@ -1496,17 +1496,17 @@ Otherwise use the path in the OSTREE_REPO environment variable

    ostree_repo_open ()

    -
    gboolean
+
    gboolean
 ostree_repo_open (OstreeRepo *self,
-                  GCancellable *cancellable,
-                  GError **error);
    
+                  GCancellable *cancellable,
+                  GError **error);

    ostree_repo_set_disable_fsync ()

    void
 ostree_repo_set_disable_fsync (OstreeRepo *self,
-                               gboolean disable_fsync);
    + gboolean disable_fsync);

    Disable requests to fsync() to stable storage during commits. This option should only be used by build system tools which are creating disposable virtual machines, or have higher level mechanisms for @@ -1527,7 +1527,7 @@ ensuring data consistency.

     - + @@ -1537,7 +1537,7 @@ ensuring data consistency.

    ostree_repo_get_disable_fsync ()

    -
    gboolean
+
    gboolean
 ostree_repo_get_disable_fsync (OstreeRepo *self);
    
 
    For more information see ostree_repo_set_disable_fsync().
    
 
    
@@ -1563,7 +1563,7 @@ ostree_repo_get_disable_fsync (
 
    
 
    ostree_repo_is_system ()
    
-
    gboolean
+
    gboolean
 ostree_repo_is_system (OstreeRepo *repo);
    
 
    
 
    Parameters
    
@@ -1582,15 +1582,15 @@ ostree_repo_is_system (
 
    Returns
    
-
     TRUE if this repository is the root-owned system global repository
    
+
     TRUE if this repository is the root-owned system global repository
    
 
    
 
    
 
    
 
    
 
    ostree_repo_is_writable ()
    
-
    gboolean
+
    gboolean
 ostree_repo_is_writable (OstreeRepo *self,
-                         GError **error);
    
+                         GError **error);
    
 
    Returns whether the repository is writable by the current user.
 If the repository is not writable, the error
  indicates why.
    
@@ -1610,7 +1610,7 @@ If the repository is not writable, the error<
    - + @@ -1618,7 +1618,7 @@ If the repository is not writable, the error<

    Returns

    -

    TRUE if this repository is writable

    +

    TRUE if this repository is writable

    @@ -1628,9 +1628,9 @@ If the repository is not writable, the error< ostree_repo_create_at (int dfd, const char *path, OstreeRepoMode mode, - GVariant *options, - GCancellable *cancellable, - GError **error); + GVariant *options, + GCancellable *cancellable, + GError **error);

    This is a file-descriptor relative version of ostree_repo_create(). Create the underlying structure on disk for the repository, and call ostree_repo_open_at() on the result, preparing it for use.

    @@ -1669,8 +1669,8 @@ the mode or configuration (repo/config) of an exist     - - + + @@ -1695,11 +1695,11 @@ the mode or configuration (repo/config) of an exist

    ostree_repo_create ()

    -
    gboolean
+
    gboolean
 ostree_repo_create (OstreeRepo *self,
                     OstreeRepoMode mode,
-                    GCancellable *cancellable,
-                    GError **error);
    
+                    GCancellable *cancellable,
+                    GError **error);

    Create the underlying structure on disk for the repository, and call ostree_repo_open() on the result, preparing it for use.

    Since version 2016.8, this function will succeed on an existing @@ -1747,7 +1747,7 @@ this function on a repository initialized via

    ostree_repo_get_bootloader ()

    -
    const gchar *
+
    const gchar *
 ostree_repo_get_bootloader (OstreeRepo *self);
    
 
    Get the bootloader configured. See the documentation for the
 "sysroot.bootloader" config key.
    
@@ -1776,7 +1776,7 @@ ostree_repo_get_bootloader (
 
    ostree_repo_get_path ()
    
-
    GFile *
+
    GFile *
 ostree_repo_get_path (OstreeRepo *self);
    
 
    Note that since the introduction of ostree_repo_open_at(), this function may
 return a process-specific path in /proc if the repository was created using
@@ -1811,10 +1811,10 @@ ostree_repo_get_mode (
 
    ostree_repo_get_min_free_space_bytes ()
    
-
    gboolean
+
    gboolean
 ostree_repo_get_min_free_space_bytes (OstreeRepo *self,
-                                      guint64 *out_reserved_bytes,
-                                      GError **error);
    
+                                      guint64 *out_reserved_bytes,
+                                      GError **error);
    
 
    Determine the number of bytes of free disk space that are reserved according
 to the repo config and return that number in out_reserved_bytes
 . See the
@@ -1841,7 +1841,7 @@ core.min-free-space-percent repo config options.
    - + @@ -1849,14 +1849,14 @@ core.min-free-space-percent repo config options.

    Returns

    -

    TRUE on success, FALSE otherwise.

    +

    TRUE on success, FALSE otherwise.

    Since: 2018.9

    ostree_repo_get_config ()

    -
    GKeyFile *
+
    GKeyFile *
 ostree_repo_get_config (OstreeRepo *self);
    
 
    
 
    Returns
    
@@ -1898,7 +1898,7 @@ repository (to see whether a ref was written).
    
 
    
 
    
 
    ostree_repo_get_default_repo_finders ()
    
-
    const gchar * const *
+
    const gchar * const *
 ostree_repo_get_default_repo_finders (OstreeRepo *self);
    
 
    Get the set of default repo finders configured. See the documentation for
 the "core.default-repo-finders" config key.
    
@@ -1919,7 +1919,7 @@ the "core.default-repo-finders" config key.
    
 
    
 
    
 
    Returns
    
-
    NULL-terminated array of strings. 
    
+
    NULL-terminated array of strings. 
    
 
    [array zero-terminated=1][element-type utf8]
    
 
    
 
    Since: 2018.9
    
@@ -1927,7 +1927,7 @@ the "core.default-repo-finders" config key.
    
 
    
 
    
 
    ostree_repo_hash ()
    
-
    guint
+
    guint
 ostree_repo_hash (OstreeRepo *self);
    
 
    Calculate a hash value for the given open repository, suitable for use when
 putting it into a hash table. It is an error to call this on an OstreeRepo
@@ -1958,14 +1958,14 @@ the repository is open and the inode of its root directory has been loaded.
    
 
    
 
    
 
    ostree_repo_equal ()
    
-
    gboolean
+
    gboolean
 ostree_repo_equal (OstreeRepo *a,
                    OstreeRepo *b);
    
 
    Check whether two opened repositories are the same on disk: if their root
 directories are the same inode. If a
  or b
  are not open yet (due to
-ostree_repo_open() not being called on them yet), FALSE will be returned.
    
+ostree_repo_open() not being called on them yet), FALSE will be returned.
    
 
    
 
    Parameters

    disable_fsync

    If TRUE, do not fsync

    If TRUE, do not fsync

    		  

    error

    a GError

    a GError

    		  

    options

    a{sv}: See below for accepted keys

    		 

    a{sv}: See below for accepted keys.

    		[nullable]

    cancellable

    error

    Return location for a GError

    Return location for a GError

    		  
    @@ -1990,16 +1990,16 @@ directories are the same inode. If a

    Returns

    -

    TRUE if a +

    TRUE if a and b -are the same repository on disk, FALSE otherwise

    +are the same repository on disk, FALSE otherwise

    Since: 2017.12

    ostree_repo_copy_config ()

    -
    GKeyFile *
+
    GKeyFile *
 ostree_repo_copy_config (OstreeRepo *self);
    
 
    
 
    Returns
    
@@ -2010,24 +2010,24 @@ ostree_repo_copy_config (
 
    ostree_repo_remote_add ()
    
-
    gboolean
+
    gboolean
 ostree_repo_remote_add (OstreeRepo *self,
                         const char *name,
                         const char *url,
-                        GVariant *options,
-                        GCancellable *cancellable,
-                        GError **error);
    
+                        GVariant *options,
+                        GCancellable *cancellable,
+                        GError **error);
    
 
    Create a new remote named name
  pointing to url
 .  If options
  is
-provided, then it will be mapped to GKeyFile entries, where the
+provided, then it will be mapped to GKeyFile entries, where the
 GVariant dictionary key is an option string, and the value is
 mapped as follows:
    
 
    
 
    
 
    Parameters
    
@@ -2075,11 +2075,11 @@ mapped as follows:
    
 
    
 
    
 
    ostree_repo_remote_delete ()
    
-
    gboolean
+
    gboolean
 ostree_repo_remote_delete (OstreeRepo *self,
                            const char *name,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);
    
 
    Delete the remote named name
 .  It is an error if the provided
 remote does not exist.
    
@@ -2119,15 +2119,15 @@ remote does not exist.
    
 
    
 
    
 
    ostree_repo_remote_change ()
    
-
    gboolean
+
    gboolean
 ostree_repo_remote_change (OstreeRepo *self,
-                           GFile *sysroot,
+                           GFile *sysroot,
                            OstreeRepoRemoteChange changeop,
                            const char *name,
                            const char *url,
-                           GVariant *options,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GVariant *options,
+                           GCancellable *cancellable,
+                           GError **error);
    
 
    A combined function handling the equivalent of
 ostree_repo_remote_add(), ostree_repo_remote_delete(), with more
 options.
    
@@ -2189,9 +2189,9 @@ options.
    
 
    ostree_repo_remote_list ()
    
 
    char **
 ostree_repo_remote_list (OstreeRepo *self,
-                         guint *out_n_remotes);
    
+                         guint *out_n_remotes);

    List available remote names in an OstreeRepo. Remote names are sorted -alphabetically. If no remotes are available the function returns NULL.

    +alphabetically. If no remotes are available the function returns NULL.

    Parameters

    @@ -2216,7 +2216,7 @@ alphabetically. If no remotes are available the function returns

    Returns

    -

    a NULL-terminated +

    a NULL-terminated array of remote names.

    [array length=out_n_remotes][transfer full]

    @@ -2224,11 +2224,11 @@ array of remote names.

    ostree_repo_remote_get_url ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_get_url (OstreeRepo *self,
                             const char *name,
                             char **out_url,
-                            GError **error);
    
+                            GError **error);

    Return the URL of the remote named name through out_url . It is an @@ -2267,17 +2267,17 @@ error if the provided remote does not exist.

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    ostree_repo_remote_get_gpg_verify ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_get_gpg_verify (OstreeRepo *self,
                                    const char *name,
-                                   gboolean *out_gpg_verify,
-                                   GError **error);
    
+                                   gboolean *out_gpg_verify,
+                                   GError **error);

    Return whether GPG verification is enabled for the remote named name through out_gpg_verify @@ -2317,18 +2317,18 @@ not exist.

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    ostree_repo_remote_get_gpg_verify_summary ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_get_gpg_verify_summary
                                (OstreeRepo *self,
                                 const char *name,
-                                gboolean *out_gpg_verify_summary,
-                                GError **error);
    
+                                gboolean *out_gpg_verify_summary,
+                                GError **error);

    Return whether GPG verification of the summary is enabled for the remote named name through out_gpg_verify_summary @@ -2368,27 +2368,27 @@ remote does not exist.

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    ostree_repo_remote_gpg_import ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_gpg_import (OstreeRepo *self,
                                const char *name,
-                               GInputStream *source_stream,
+                               GInputStream *source_stream,
                                const char * const *key_ids,
-                               guint *out_imported,
-                               GCancellable *cancellable,
-                               GError **error);
    
+                               guint *out_imported,
+                               GCancellable *cancellable,
+                               GError **error);

    Imports one or more GPG keys from the open source_stream , or from the user's personal keyring if source_stream - is NULL. The key_ids + is NULL. The key_ids array can optionally restrict which keys are imported. If key_ids - is NULL, + is NULL, then all keys are imported.

    The imported keys will be used to conduct GPG verification when pulling from the remote named name @@ -2414,28 +2414,28 @@ from the remote named name

    - + - + +keys, or NULL.

    - + - + @@ -2443,19 +2443,19 @@ keys, or

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    ostree_repo_remote_fetch_summary ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_fetch_summary (OstreeRepo *self,
                                   const char *name,
-                                  GBytes **out_summary,
-                                  GBytes **out_signatures,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  GBytes **out_summary,
+                                  GBytes **out_signatures,
+                                  GCancellable *cancellable,
+                                  GError **error);

    Tries to fetch the summary file and any GPG signatures on the summary file over HTTP, and returns the binary data in out_summary and out_signatures @@ -2467,10 +2467,10 @@ respectively.

    . Likewise if the summary file is not signed, out_signatures is set to NULL -. In either case the function still returns TRUE.

    +. In either case the function still returns TRUE.

    This method does not verify the signature of the downloaded summary file. Use ostree_repo_verify_summary() for that.

    -

    Parse the summary data into a GVariant using g_variant_new_from_bytes() +

    Parse the summary data into a GVariant using g_variant_new_from_bytes() with OSTREE_SUMMARY_GVARIANT_FORMAT as the format string.

    Parameters

    @@ -2494,23 +2494,23 @@ with

    out_summary

     +NULL.

    +signature data, or NULL.

    - + - + @@ -2518,21 +2518,21 @@ signature data, or

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    ostree_repo_remote_fetch_summary_with_options ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_fetch_summary_with_options
                                (OstreeRepo *self,
                                 const char *name,
-                                GVariant *options,
-                                GBytes **out_summary,
-                                GBytes **out_signatures,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GVariant *options,
+                                GBytes **out_summary,
+                                GBytes **out_signatures,
+                                GCancellable *cancellable,
+                                GError **error);

    Like ostree_repo_remote_fetch_summary(), but supports an extensible set of flags. The following are currently defined:

      @@ -2570,23 +2570,23 @@ means return errors without retrying

     +NULL.

    +signature data, or NULL.

    - + - + @@ -2594,17 +2594,17 @@ signature data, or

    Returns

    -

    TRUE on success, FALSE on failure

    +

    TRUE on success, FALSE on failure

    Since: 2016.6

    ostree_repo_reload_config ()

    -
    gboolean
+
    gboolean
 ostree_repo_reload_config (OstreeRepo *self,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);

    By default, an OstreeRepo will cache the remote configuration and its own repo/config data. This API can be used to reload it.

    @@ -2639,13 +2639,13 @@ own repo/config data. This API can be used to reload it.

    ostree_repo_get_remote_boolean_option ()

    -
    gboolean
+
    gboolean
 ostree_repo_get_remote_boolean_option (OstreeRepo *self,
                                        const char *remote_name,
                                        const char *option_name,
-                                       gboolean default_value,
-                                       gboolean *out_value,
-                                       GError **error);
    
+                                       gboolean default_value,
+                                       gboolean *out_value,
+                                       GError **error);

    OSTree remotes are represented by keyfile groups, formatted like: [remote "remotename"]. This function returns a value named option_name @@ -2654,7 +2654,7 @@ If the option is not set, out_value will be set to default_value . If an error is returned, out_value - will be set to FALSE.

    + will be set to FALSE.

    Parameters

    source_stream

    a GInputStream, or NULL.

    a GInputStream, or NULL.

    		[nullable]

    key_ids

    a NULL-terminated array of GPG key IDs, or NULL.

    a NULL-terminated array of GPG key IDs, or NULL.

    		[array zero-terminated=1][element-type utf8][nullable]

    out_imported

    return location for the number of imported -keys, or NULL.

    		[out][optional]

    cancellable

    a GCancellable

    a GCancellable

    		  

    error

    a GError

    a GError

    		  

    return location for raw summary data, or -NULL.

    		[out][optional]

    out_signatures

    return location for raw summary -signature data, or NULL.

    		[out][optional]

    cancellable

    a GCancellable

    a GCancellable

    		  

    error

    a GError

    a GError

    		  

    out_summary

    return location for raw summary data, or -NULL.

    		[out][optional]

    out_signatures

    return location for raw summary -signature data, or NULL.

    		[out][optional]

    cancellable

    a GCancellable

    a GCancellable

    		  

    error

    a GError

    a GError

    		  
    @@ -2700,7 +2700,7 @@ is not present

    Returns

    -

    TRUE on success, otherwise FALSE with error +

    TRUE on success, otherwise FALSE with error set

    Since: 2016.5

    @@ -2708,19 +2708,19 @@ set

    ostree_repo_get_remote_list_option ()

    -
    gboolean
+
    gboolean
 ostree_repo_get_remote_list_option (OstreeRepo *self,
                                     const char *remote_name,
                                     const char *option_name,
                                     char ***out_value,
-                                    GError **error);
    
+                                    GError **error);

    OSTree remotes are represented by keyfile groups, formatted like: [remote "remotename"]. This function returns a value named option_name underneath that group, and returns it as a zero terminated array of strings. If the option is not set, or if an error is returned, out_value will be set -to NULL.

    +to NULL.

    Parameters

    @@ -2749,7 +2749,7 @@ to

    out_value

     +g_strfreev().

    @@ -2762,7 +2762,7 @@ of strings. The list should be freed with

    Returns

    -

    TRUE on success, otherwise FALSE with error +

    TRUE on success, otherwise FALSE with error set

    Since: 2016.5

    @@ -2770,20 +2770,20 @@ set

    ostree_repo_get_remote_option ()

    -
    gboolean
+
    gboolean
 ostree_repo_get_remote_option (OstreeRepo *self,
                                const char *remote_name,
                                const char *option_name,
                                const char *default_value,
                                char **out_value,
-                               GError **error);
    
+                               GError **error);

    OSTree remotes are represented by keyfile groups, formatted like: [remote "remotename"]. This function returns a value named option_name underneath that group, or default_value if the remote exists but not the option name. If an error is returned, out_value - will be set to NULL.

    + will be set to NULL.

    Parameters

    location to store the list of strings. The list should be freed with -g_strfreev().

    		[out][array zero-terminated=1]
    @@ -2829,7 +2829,7 @@ is not present.

    Returns

    -

    TRUE on success, otherwise FALSE with error +

    TRUE on success, otherwise FALSE with error set

    Since: 2016.5

    @@ -2858,17 +2858,17 @@ called.

    Returns

    -

    Parent repository, or NULL if none.

    +

    Parent repository, or NULL if none.

    [transfer none]

    ostree_repo_write_config ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_config (OstreeRepo *self,
-                          GKeyFile *new_config,
-                          GError **error);
    
+                          GKeyFile *new_config,
+                          GError **error);

    Save new_config in place of this repository's config file.

    @@ -2892,7 +2892,7 @@ ostree_repo_write_config (

    error

    -
     + @@ -2902,10 +2902,10 @@ ostree_repo_write_config (

    ostree_repo_scan_hardlinks ()

    -
    gboolean
+
    gboolean
 ostree_repo_scan_hardlinks (OstreeRepo *self,
-                            GCancellable *cancellable,
-                            GError **error);
    
+                            GCancellable *cancellable,
+                            GError **error);

    This function is deprecated in favor of using ostree_repo_devino_cache_new(), which allows a precise mapping to be built up between hardlink checkout files and their checksums between ostree_repo_checkout_at() and @@ -2951,11 +2951,11 @@ before you call

    ostree_repo_prepare_transaction ()

    -
    gboolean
+
    gboolean
 ostree_repo_prepare_transaction (OstreeRepo *self,
-                                 gboolean *out_transaction_resume,
-                                 GCancellable *cancellable,
-                                 GError **error);
    
+                                 gboolean *out_transaction_resume,
+                                 GCancellable *cancellable,
+                                 GError **error);

    Starts or resumes a transaction. In order to write to a repo, you need to start a transaction. You can complete the transaction with ostree_repo_commit_transaction(), or abort the transaction with @@ -3008,11 +3008,11 @@ pulls use per-commit state/.commitpartial files.

    ostree_repo_commit_transaction ()

    -
    gboolean
+
    gboolean
 ostree_repo_commit_transaction (OstreeRepo *self,
                                 OstreeRepoTransactionStats *out_stats,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);

    Complete the transaction. Any refs set with ostree_repo_transaction_set_ref() or ostree_repo_transaction_set_refspec() will be written out.

    @@ -3058,10 +3058,10 @@ that happened during this transaction.

    ostree_repo_abort_transaction ()

    -
    gboolean
+
    gboolean
 ostree_repo_abort_transaction (OstreeRepo *self,
-                               GCancellable *cancellable,
-                               GError **error);
    
+                               GCancellable *cancellable,
+                               GError **error);

    Abort the active transaction; any staged objects and ref changes will be discarded. You *must* invoke this if you have chosen not to invoke ostree_repo_commit_transaction(). Calling this function when not in a @@ -3143,13 +3143,13 @@ ostree_repo_transaction_set_ref (const char *ref, const char *checksum);

    If checksum - is not NULL, then record it as the target of ref named + is not NULL, then record it as the target of ref named ref ; if remote is provided, the ref will appear to originate from that remote.

    Otherwise, if checksum - is NULL, then record that the ref should + is NULL, then record that the ref should be deleted.

    The change will be written when the transaction is completed with ostree_repo_commit_transaction(); that function takes care of writing all of @@ -3200,13 +3200,13 @@ case.

    ostree_repo_set_ref_immediate ()

    -
    gboolean
+
    gboolean
 ostree_repo_set_ref_immediate (OstreeRepo *self,
                                const char *remote,
                                const char *ref,
                                const char *checksum,
-                               GCancellable *cancellable,
-                               GError **error);
    
+                               GCancellable *cancellable,
+                               GError **error);

    This is like ostree_repo_transaction_set_ref(), except it may be invoked outside of a transaction. This is presently safe for the case where we're creating or overwriting an existing ref.

    @@ -3237,7 +3237,7 @@ case where we're creating or overwriting an existing ref.

     - + @@ -3257,13 +3257,13 @@ case where we're creating or overwriting an existing ref.

    ostree_repo_set_alias_ref_immediate ()

    -
    gboolean
+
    gboolean
 ostree_repo_set_alias_ref_immediate (OstreeRepo *self,
                                      const char *remote,
                                      const char *ref,
                                      const char *target,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     GCancellable *cancellable,
+                                     GError **error);

    Like ostree_repo_set_ref_immediate(), but creates an alias.

    Parameters

    @@ -3291,7 +3291,7 @@ ostree_repo_set_alias_ref_immediate (
    - + @@ -3312,12 +3312,12 @@ ostree_repo_set_alias_ref_immediate (

    ostree_repo_set_cache_dir ()

    -
    gboolean
+
    gboolean
 ostree_repo_set_cache_dir (OstreeRepo *self,
                            int dfd,
                            const char *path,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);

    Set a custom location for the cache directory used for e.g. per-remote summary caches. Setting this manually is useful when doing operations on a system repo as a user because you don't have @@ -3349,12 +3349,12 @@ write permissions in the repo, where the cache is normally stored.

     - + - + @@ -3365,14 +3365,14 @@ write permissions in the repo, where the cache is normally stored.

    ostree_repo_sign_delta ()

    -
    gboolean
+
    gboolean
 ostree_repo_sign_delta (OstreeRepo *self,
-                        const gchar *from_commit,
-                        const gchar *to_commit,
-                        const gchar *key_id,
-                        const gchar *homedir,
-                        GCancellable *cancellable,
-                        GError **error);
    
+                        const gchar *from_commit,
+                        const gchar *to_commit,
+                        const gchar *key_id,
+                        const gchar *homedir,
+                        GCancellable *cancellable,
+                        GError **error);

    This function is deprecated, sign the summary file instead. Add a GPG signature to a static delta.

    @@ -3426,17 +3426,17 @@ Add a GPG signature to a static delta.

    ostree_repo_has_object ()

    -
    gboolean
+
    gboolean
 ostree_repo_has_object (OstreeRepo *self,
                         OstreeObjectType objtype,
                         const char *checksum,
-                        gboolean *out_have_object,
-                        GCancellable *cancellable,
-                        GError **error);
    
+                        gboolean *out_have_object,
+                        GCancellable *cancellable,
+                        GError **error);

    Set out_have_object - to TRUE if self + to TRUE if self contains the given object; -FALSE otherwise.

    +FALSE otherwise.

    Parameters

    a GError

    a GError

    		  

    checksum

    The checksum to point it to, or NULL to unset.

    The checksum to point it to, or NULL to unset.

    		[allow-none]

    target

    The ref target to point it to, or NULL to unset.

    The ref target to point it to, or NULL to unset.

    		[allow-none]

    cancellable

    a GCancellable

    a GCancellable

    		  

    error

    a GError

    a GError

    		  
    @@ -3463,7 +3463,7 @@ ostree_repo_has_object (

    out_have_object

    -     + @@ -3481,17 +3481,17 @@ ostree_repo_has_object (

    Returns

    -

    FALSE if an unexpected error occurred, TRUE otherwise

    +

    FALSE if an unexpected error occurred, TRUE otherwise

    ostree_repo_mark_commit_partial ()

    -
    gboolean
+
    gboolean
 ostree_repo_mark_commit_partial (OstreeRepo *self,
                                  const char *checksum,
-                                 gboolean is_partial,
-                                 GError **error);
    
+                                 gboolean is_partial,
+                                 GError **error);

    Commits in the "partial" state do not have all their child objects written. This occurs in various situations, such as during a pull, but also if a "subpath" pull is used, as well as "commit only" @@ -3535,13 +3535,13 @@ should use this if you are implementing a different type of transport.

    ostree_repo_mark_commit_partial_reason ()

    -
    gboolean
+
    gboolean
 ostree_repo_mark_commit_partial_reason
                                (OstreeRepo *self,
                                 const char *checksum,
-                                gboolean is_partial,
+                                gboolean is_partial,
                                 OstreeRepoCommitState in_state,
-                                GError **error);
    
+                                GError **error);

    Allows the setting of a reason code for a partial commit. Presently it only supports setting reason bitmask to OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL, or @@ -3591,20 +3591,20 @@ it.

    ostree_repo_write_metadata ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_metadata (OstreeRepo *self,
                             OstreeObjectType objtype,
                             const char *expected_checksum,
-                            GVariant *object,
-                            guchar **out_csum,
-                            GCancellable *cancellable,
-                            GError **error);
    
+                            GVariant *object,
+                            guchar **out_csum,
+                            GCancellable *cancellable,
+                            GError **error);

    Store the metadata object object . Return the checksum as out_csum .

    If expected_checksum - is not NULL, verify it against the + is not NULL, verify it against the computed checksum.

    Parameters

    @@ -3661,10 +3661,10 @@ computed checksum.

    ostree_repo_write_metadata_async (OstreeRepo *self, OstreeObjectType objtype, const char *expected_checksum, - GVariant *object, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GVariant *object, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

    Asynchronously store the metadata object variant . If provided, the checksum expected_checksum @@ -3721,11 +3721,11 @@ the checksum expected_checksum

    ostree_repo_write_metadata_finish ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_metadata_finish (OstreeRepo *self,
-                                   GAsyncResult *result,
-                                   guchar **out_csum,
-                                   GError **error);
    
+                                   GAsyncResult *result,
+                                   guchar **out_csum,
+                                   GError **error);

    Complete a call to ostree_repo_write_metadata_async().

    Parameters

    @@ -3763,14 +3763,14 @@ ostree_repo_write_metadata_finish (

    ostree_repo_write_content ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_content (OstreeRepo *self,
                            const char *expected_checksum,
-                           GInputStream *object_input,
-                           guint64 length,
-                           guchar **out_csum,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GInputStream *object_input,
+                           guint64 length,
+                           guchar **out_csum,
+                           GCancellable *cancellable,
+                           GError **error);

    Store the content object streamed as object_input , with total length length @@ -3829,13 +3829,13 @@ be returned as out_csum

    ostree_repo_write_metadata_trusted ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_metadata_trusted (OstreeRepo *self,
                                     OstreeObjectType objtype,
                                     const char *checksum,
-                                    GVariant *variant,
-                                    GCancellable *cancellable,
-                                    GError **error);
    
+                                    GVariant *variant,
+                                    GCancellable *cancellable,
+                                    GError **error);

    Store the metadata object variant ; the provided checksum is @@ -3886,15 +3886,15 @@ trusted.

    ostree_repo_write_metadata_stream_trusted ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_metadata_stream_trusted
                                (OstreeRepo *self,
                                 OstreeObjectType objtype,
                                 const char *checksum,
-                                GInputStream *object_input,
-                                guint64 length,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GInputStream *object_input,
+                                guint64 length,
+                                GCancellable *cancellable,
+                                GError **error);

    Store the metadata object variant ; the provided checksum is @@ -3950,13 +3950,13 @@ trusted.

    ostree_repo_write_content_trusted ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_content_trusted (OstreeRepo *self,
                                    const char *checksum,
-                                   GInputStream *object_input,
-                                   guint64 length,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GInputStream *object_input,
+                                   guint64 length,
+                                   GCancellable *cancellable,
+                                   GError **error);

    Store the content object streamed as object_input , with total length length @@ -4015,11 +4015,11 @@ disk, for example.

    void
 ostree_repo_write_content_async (OstreeRepo *self,
                                  const char *expected_checksum,
-                                 GInputStream *object,
-                                 guint64 length,
-                                 GCancellable *cancellable,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data);
    + GInputStream *object, + guint64 length, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

    Asynchronously store the content object object . If provided, the checksum expected_checksum @@ -4077,11 +4077,11 @@ checksum expected_checksum

    ostree_repo_write_content_finish ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_content_finish (OstreeRepo *self,
-                                  GAsyncResult *result,
-                                  guchar **out_csum,
-                                  GError **error);
    
+                                  GAsyncResult *result,
+                                  guchar **out_csum,
+                                  GError **error);

    Completes an invocation of ostree_repo_write_content_async().

    Parameters

    @@ -4099,7 +4099,7 @@ ostree_repo_write_content_finish (
    - + @@ -4109,7 +4109,7 @@ ostree_repo_write_content_finish ( - + @@ -4119,12 +4119,12 @@ ostree_repo_write_content_finish (

    ostree_repo_resolve_rev ()

    -
    gboolean
+
    gboolean
 ostree_repo_resolve_rev (OstreeRepo *self,
                          const char *refspec,
-                         gboolean allow_noent,
+                         gboolean allow_noent,
                          char **out_rev,
-                         GError **error);
    
+                         GError **error);

    Look up the given refspec, returning the checksum it references in the parameter out_rev . Will fall back on remote directory if cannot @@ -4155,9 +4155,9 @@ find the given refspec in local.

     - - + @@ -4171,13 +4171,13 @@ is true and it does not exist.

    ostree_repo_resolve_rev_ext ()

    -
    gboolean
+
    gboolean
 ostree_repo_resolve_rev_ext (OstreeRepo *self,
                              const char *refspec,
-                             gboolean allow_noent,
+                             gboolean allow_noent,
                              OstreeRepoResolveRevExtFlags flags,
                              char **out_rev,
-                             GError **error);
    
+                             GError **error);

    Look up the given refspec, returning the checksum it references in the parameter out_rev . Differently from ostree_repo_resolve_rev(), @@ -4216,9 +4216,9 @@ using it has no effect.

     - - + @@ -4233,14 +4233,14 @@ is true and it does not exist.

    ostree_repo_list_refs ()

    -
    gboolean
+
    gboolean
 ostree_repo_list_refs (OstreeRepo *self,
                        const char *refspec_prefix,
-                       GHashTable **out_all_refs,
-                       GCancellable *cancellable,
-                       GError **error);
    
+                       GHashTable **out_all_refs,
+                       GCancellable *cancellable,
+                       GError **error);

    If refspec_prefix - is NULL, list all local and remote refspecs, + is NULL, list all local and remote refspecs, with their current values in out_all_refs . Otherwise, only list refspecs which have refspec_prefix @@ -4248,7 +4248,7 @@ refspecs which have refspec_prefix

    out_all_refs will be returned as a mapping from refspecs (including the remote name) to checksums. If refspec_prefix - is non-NULL, it will be + is non-NULL, it will be removed as a prefix from the hash table keys.

    Parameters

    @@ -4291,15 +4291,15 @@ removed as a prefix from the hash table keys.

    ostree_repo_list_refs_ext ()

    -
    gboolean
+
    gboolean
 ostree_repo_list_refs_ext (OstreeRepo *self,
                            const char *refspec_prefix,
-                           GHashTable **out_all_refs,
+                           GHashTable **out_all_refs,
                            OstreeRepoListRefsExtFlags flags,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);

    If refspec_prefix - is NULL, list all local and remote refspecs, + is NULL, list all local and remote refspecs, with their current values in out_all_refs . Otherwise, only list refspecs which have refspec_prefix @@ -4356,12 +4356,12 @@ remote name) to checksums. Differently from

    ostree_repo_remote_list_refs ()

    -
    gboolean
+
    gboolean
 ostree_repo_remote_list_refs (OstreeRepo *self,
                               const char *remote_name,
-                              GHashTable **out_all_refs,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              GHashTable **out_all_refs,
+                              GCancellable *cancellable,
+                              GError **error);

    Parameters

    TRUE if repository contains object.

    TRUE if repository contains object.

    		[out]

    result

    a GAsyncResult

    a GAsyncResult

    		  

    error

    a GError

    a GError

    		  

    out_rev

    A checksum,or NULL if allow_noent +

    A checksum,or NULL if allow_noent is true and it does not exist.

    		[out][transfer full][out][nullable][transfer full]

    error

    out_rev

    A checksum,or NULL if allow_noent +

    A checksum,or NULL if allow_noent is true and it does not exist.

    		[out][transfer full][out][nullable][transfer full]

    error

    @@ -4403,12 +4403,12 @@ ostree_repo_remote_list_refs (

    ostree_repo_load_variant ()

    -
    gboolean
+
    gboolean
 ostree_repo_load_variant (OstreeRepo *self,
                           OstreeObjectType objtype,
                           const char *sha256,
-                          GVariant **out_variant,
-                          GError **error);
    
+                          GVariant **out_variant,
+                          GError **error);

    Load the metadata object sha256 of type objtype , storing the @@ -4455,12 +4455,12 @@ result in out_variant

    ostree_repo_load_commit ()

    -
    gboolean
+
    gboolean
 ostree_repo_load_commit (OstreeRepo *self,
                          const char *checksum,
-                         GVariant **out_commit,
+                         GVariant **out_commit,
                          OstreeRepoCommitState *out_state,
-                         GError **error);
    
+                         GError **error);

    A version of ostree_repo_load_variant() specialized to commits, capable of returning extended state information. Currently the only extended state is OSTREE_REPO_COMMIT_STATE_PARTIAL, which @@ -4506,18 +4506,18 @@ means that only a sub-path of the commit is available.

    ostree_repo_load_variant_if_exists ()

    -
    gboolean
+
    gboolean
 ostree_repo_load_variant_if_exists (OstreeRepo *self,
                                     OstreeObjectType objtype,
                                     const char *sha256,
-                                    GVariant **out_variant,
-                                    GError **error);
    
+                                    GVariant **out_variant,
+                                    GError **error);

    Attempt to load the metadata object sha256 of type objtype if it exists, storing the result in out_variant . If it doesn't exist, -NULL is returned.

    +NULL is returned.

    Parameters

    @@ -4559,14 +4559,14 @@ exists, storing the result in out_variant

    ostree_repo_load_file ()

    -
    gboolean
+
    gboolean
 ostree_repo_load_file (OstreeRepo *self,
                        const char *checksum,
-                       GInputStream **out_input,
-                       GFileInfo **out_file_info,
-                       GVariant **out_xattrs,
-                       GCancellable *cancellable,
-                       GError **error);
    
+                       GInputStream **out_input,
+                       GFileInfo **out_file_info,
+                       GVariant **out_xattrs,
+                       GCancellable *cancellable,
+                       GError **error);

    Load content object, decomposing it into three parts: the actual content (for regular files), the metadata, and extended attributes.

    @@ -4620,14 +4620,14 @@ content (for regular files), the metadata, and extended attributes.

    ostree_repo_load_object_stream ()

    -
    gboolean
+
    gboolean
 ostree_repo_load_object_stream (OstreeRepo *self,
                                 OstreeObjectType objtype,
                                 const char *checksum,
-                                GInputStream **out_input,
-                                guint64 *out_size,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GInputStream **out_input,
+                                guint64 *out_size,
+                                GCancellable *cancellable,
+                                GError **error);

    Load object as a stream; useful when copying objects between repositories.

    @@ -4682,13 +4682,13 @@ repositories.

    ostree_repo_query_object_storage_size ()

    -
    gboolean
+
    gboolean
 ostree_repo_query_object_storage_size (OstreeRepo *self,
                                        OstreeObjectType objtype,
                                        const char *sha256,
-                                       guint64 *out_size,
-                                       GCancellable *cancellable,
-                                       GError **error);
    
+                                       guint64 *out_size,
+                                       GCancellable *cancellable,
+                                       GError **error);

    Return the size in bytes of object with checksum sha256 , after any compression has been applied.

    @@ -4738,13 +4738,13 @@ compression has been applied.

    ostree_repo_import_object_from ()

    -
    gboolean
+
    gboolean
 ostree_repo_import_object_from (OstreeRepo *self,
                                 OstreeRepo *source,
                                 OstreeObjectType objtype,
                                 const char *checksum,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);

    Copy object named by objtype and checksum into self @@ -4800,22 +4800,22 @@ hard link operation.

    ostree_repo_import_object_from_with_trust ()

    -
    gboolean
+
    gboolean
 ostree_repo_import_object_from_with_trust
                                (OstreeRepo *self,
                                 OstreeRepo *source,
                                 OstreeObjectType objtype,
                                 const char *checksum,
-                                gboolean trusted,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                gboolean trusted,
+                                GCancellable *cancellable,
+                                GError **error);

    Copy object named by objtype and checksum into self from the source repository source . If trusted - is TRUE and both + is TRUE and both repositories are of the same type and on the same filesystem, this will simply be a fast Unix hard link operation.

    Otherwise, a copy will be performed.

    @@ -4850,7 +4850,7 @@ this will simply be a fast Unix hard link operation.

     - + @@ -4871,14 +4871,14 @@ this will simply be a fast Unix hard link operation.

    ostree_repo_import_archive_to_mtree ()

    -
    gboolean
+
    gboolean
 ostree_repo_import_archive_to_mtree (OstreeRepo *self,
                                      OstreeRepoImportArchiveOptions *opts,
                                      void *archive,
                                      OstreeMutableTree *mtree,
                                      OstreeRepoCommitModifier *modifier,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     GCancellable *cancellable,
+                                     GError **error);

    Import an archive file archive into the repository, and write its file structure to mtree @@ -4935,13 +4935,13 @@ file structure to mtree

    ostree_repo_export_tree_to_archive ()

    -
    gboolean
+
    gboolean
 ostree_repo_export_tree_to_archive (OstreeRepo *self,
                                     OstreeRepoExportArchiveOptions *opts,
                                     OstreeRepoFile *root,
                                     void *archive,
-                                    GCancellable *cancellable,
-                                    GError **error);
    
+                                    GCancellable *cancellable,
+                                    GError **error);

    Import an archive file archive into the repository, and write its file structure to mtree @@ -4993,16 +4993,16 @@ file structure to mtree

    ostree_repo_delete_object ()

    -
    gboolean
+
    gboolean
 ostree_repo_delete_object (OstreeRepo *self,
                            OstreeObjectType objtype,
                            const char *sha256,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);

    Remove the object of type objtype with checksum sha256 -from the repository. An error of type G_IO_ERROR_NOT_FOUND +from the repository. An error of type G_IO_ERROR_NOT_FOUND is thrown if the object does not exist.

    Parameters

    @@ -5045,12 +5045,12 @@ is thrown if the object does not exist.

    ostree_repo_fsck_object ()

    -
    gboolean
+
    gboolean
 ostree_repo_fsck_object (OstreeRepo *self,
                          OstreeObjectType objtype,
                          const char *sha256,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);

    Verify consistency of the object; this performs checks only relevant to the immediate object itself, such as checksumming. This API call will not itself traverse metadata objects for example.

    @@ -5099,8 +5099,8 @@ traverse metadata objects for example.

    OstreeRepoCommitFilterResult
 (*OstreeRepoCommitFilter) (OstreeRepo *repo,
                            const char *path,
-                           GFileInfo *file_info,
-                           gpointer user_data);
    + GFileInfo *file_info, + gpointer user_data);

    Parameters

    trusted

    If TRUE, assume the source repo is valid and trusted

    If TRUE, assume the source repo is valid and trusted

    		  
    @@ -5144,8 +5144,8 @@ traverse metadata objects for example.

    OstreeRepoCommitModifier *
 ostree_repo_commit_modifier_new (OstreeRepoCommitModifierFlags flags,
                                  OstreeRepoCommitFilter commit_filter,
-                                 gpointer user_data,
-                                 GDestroyNotify destroy_notify);
    + gpointer user_data, + GDestroyNotify destroy_notify);

    Parameters

    @@ -5172,7 +5172,7 @@ ostree_repo_commit_modifier_new ( - + @@ -5187,12 +5187,12 @@ ostree_repo_commit_modifier_new (

    OstreeRepoCommitModifierXattrCallback ()

    -
    GVariant *
+
    GVariant *
 (*OstreeRepoCommitModifierXattrCallback)
                                (OstreeRepo *repo,
                                 const char *path,
-                                GFileInfo *file_info,
-                                gpointer user_data);
    
+                                GFileInfo *file_info,
+                                gpointer user_data);
    @@ -5201,8 +5201,8 @@ ostree_repo_commit_modifier_new (OstreeRepoCommitModifier *modifier, OstreeRepoCommitModifierXattrCallback callback, - GDestroyNotify destroy, - gpointer user_data); + GDestroyNotify destroy, + gpointer user_data);

    If set, this function should return extended attributes to use for the given path. This is useful for things like ACLs and SELinux, where a build system can label the files as it's committing to the @@ -5249,7 +5249,7 @@ ostree_repo_commit_modifier_set_sepolicy (OstreeRepoCommitModifier *modifier, OstreeSePolicy *sepolicy);

    If policy - is non-NULL, use it to look up labels to use for + is non-NULL, use it to look up labels to use for "security.selinux" extended attributes.

    Note that any policy specified this way operates in addition to any extended attributes provided via @@ -5282,13 +5282,13 @@ policy wins.

    ostree_repo_commit_modifier_set_sepolicy_from_commit ()

    -
    gboolean
+
    gboolean
 ostree_repo_commit_modifier_set_sepolicy_from_commit
                                (OstreeRepoCommitModifier *modifier,
                                 OstreeRepo *repo,
                                 const char *rev,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);

    In many cases, one wants to create a "derived" commit from base commit. SELinux policy labels are part of that base commit. This API allows one to easily set up SELinux labeling from a base commit.

    @@ -5407,19 +5407,19 @@ ostree_repo_devino_cache_unref (O

    ostree_repo_devino_cache_get_type ()

    -
    GType
+
    GType
 ostree_repo_devino_cache_get_type (void);

    ostree_repo_write_directory_to_mtree ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_directory_to_mtree (OstreeRepo *self,
-                                      GFile *dir,
+                                      GFile *dir,
                                       OstreeMutableTree *mtree,
                                       OstreeRepoCommitModifier *modifier,
-                                      GCancellable *cancellable,
-                                      GError **error);
    
+                                      GCancellable *cancellable,
+                                      GError **error);

    Store objects for dir and all children into the repository self , @@ -5471,14 +5471,14 @@ overlaying the resulting filesystem hierarchy into m

    ostree_repo_write_dfd_to_mtree ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_dfd_to_mtree (OstreeRepo *self,
                                 int dfd,
                                 const char *path,
                                 OstreeMutableTree *mtree,
                                 OstreeRepoCommitModifier *modifier,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);

    Store as objects all contents of the directory referred to by dfd and path @@ -5537,14 +5537,14 @@ resulting filesystem hierarchy into mtree

    ostree_repo_write_archive_to_mtree ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_archive_to_mtree (OstreeRepo *self,
-                                    GFile *archive,
+                                    GFile *archive,
                                     OstreeMutableTree *mtree,
                                     OstreeRepoCommitModifier *modifier,
-                                    gboolean autocreate_parents,
-                                    GCancellable *cancellable,
-                                    GError **error);
    
+                                    gboolean autocreate_parents,
+                                    GCancellable *cancellable,
+                                    GError **error);

    Import an archive file archive into the repository, and write its file structure to mtree @@ -5600,15 +5600,15 @@ file structure to mtree

    ostree_repo_write_archive_to_mtree_from_fd ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_archive_to_mtree_from_fd
                                (OstreeRepo *self,
                                 int fd,
                                 OstreeMutableTree *mtree,
                                 OstreeRepoCommitModifier *modifier,
-                                gboolean autocreate_parents,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                gboolean autocreate_parents,
+                                GCancellable *cancellable,
+                                GError **error);

    Read an archive from fd and import it into the repository, writing its file structure to mtree @@ -5664,12 +5664,12 @@ its file structure to mtree

    ostree_repo_write_mtree ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_mtree (OstreeRepo *self,
                          OstreeMutableTree *mtree,
-                         GFile **out_file,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GFile **out_file,
+                         GCancellable *cancellable,
+                         GError **error);

    Write all metadata objects for mtree to repo; the resulting out_file @@ -5718,16 +5718,16 @@ the mtree

    ostree_repo_write_commit ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_commit (OstreeRepo *self,
                           const char *parent,
                           const char *subject,
                           const char *body,
-                          GVariant *metadata,
+                          GVariant *metadata,
                           OstreeRepoFile *root,
                           char **out_commit,
-                          GCancellable *cancellable,
-                          GError **error);
    
+                          GCancellable *cancellable,
+                          GError **error);

    Write a commit metadata object, referencing root_contents_checksum and root_metadata_checksum @@ -5748,7 +5748,7 @@ and root_metadata_checksum

    - + @@ -5763,7 +5763,7 @@ and root_metadata_checksum - + @@ -5793,17 +5793,17 @@ and root_metadata_checksum

    ostree_repo_write_commit_with_time ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_commit_with_time (OstreeRepo *self,
                                     const char *parent,
                                     const char *subject,
                                     const char *body,
-                                    GVariant *metadata,
+                                    GVariant *metadata,
                                     OstreeRepoFile *root,
-                                    guint64 time,
+                                    guint64 time,
                                     char **out_commit,
-                                    GCancellable *cancellable,
-                                    GError **error);
    
+                                    GCancellable *cancellable,
+                                    GError **error);

    Write a commit metadata object, referencing root_contents_checksum and root_metadata_checksum @@ -5824,7 +5824,7 @@ and root_metadata_checksum

    - + @@ -5839,7 +5839,7 @@ and root_metadata_checksum - + @@ -5874,17 +5874,17 @@ and root_metadata_checksum

    ostree_repo_read_commit_detached_metadata ()

    -
    gboolean
+
    gboolean
 ostree_repo_read_commit_detached_metadata
                                (OstreeRepo *self,
                                 const char *checksum,
-                                GVariant **out_metadata,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GVariant **out_metadata,
+                                GCancellable *cancellable,
+                                GError **error);

    OSTree commits can have arbitrary metadata associated; this function retrieves them. If none exists, out_metadata will be set -to NULL.

    +to NULL.

    Parameters

    destroy_notify

    A GDestroyNotify

    A GDestroyNotify

    		  

    parent

    ASCII SHA256 checksum for parent, or NULL for none.

    ASCII SHA256 checksum for parent, or NULL for none.

    		[allow-none]

    metadata

    GVariant of type a{sv}, or NULL for none.

    GVariant of type a{sv}, or NULL for none.

    		[allow-none]

    parent

    ASCII SHA256 checksum for parent, or NULL for none.

    ASCII SHA256 checksum for parent, or NULL for none.

    		[allow-none]

    metadata

    GVariant of type a{sv}, or NULL for none.

    GVariant of type a{sv}, or NULL for none.

    		[allow-none]
    @@ -5906,7 +5906,7 @@ to - + @@ -5926,18 +5926,18 @@ to

    ostree_repo_write_commit_detached_metadata ()

    -
    gboolean
+
    gboolean
 ostree_repo_write_commit_detached_metadata
                                (OstreeRepo *self,
                                 const char *checksum,
-                                GVariant *metadata,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GVariant *metadata,
+                                GCancellable *cancellable,
+                                GError **error);

    Replace any existing metadata associated with commit referred to by checksum with metadata . If metadata - is NULL, then existing + is NULL, then existing data will be deleted.

    Parameters

    @@ -5960,7 +5960,7 @@ data will be deleted.

     - + @@ -6019,15 +6019,15 @@ ostree_repo_checkout_at_options_set_devino

    ostree_repo_checkout_tree ()

    -
    gboolean
+
    gboolean
 ostree_repo_checkout_tree (OstreeRepo *self,
                            OstreeRepoCheckoutMode mode,
                            OstreeRepoCheckoutOverwriteMode overwrite_mode,
-                           GFile *destination,
+                           GFile *destination,
                            OstreeRepoFile *source,
-                           GFileInfo *source_info,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GFileInfo *source_info,
+                           GCancellable *cancellable,
+                           GError **error);

    Check out source into destination , which must live on the @@ -6093,14 +6093,14 @@ files are checked out.

    ostree_repo_checkout_tree_at ()

    -
    gboolean
+
    gboolean
 ostree_repo_checkout_tree_at (OstreeRepo *self,
                               OstreeRepoCheckoutOptions *options,
                               int destination_dfd,
                               const char *destination_path,
                               const char *commit,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              GCancellable *cancellable,
+                              GError **error);

    ostree_repo_checkout_tree_at is deprecated and should not be used in newly-written code.

    Similar to ostree_repo_checkout_tree(), but uses directory-relative paths for the destination, uses a new OstreeRepoCheckoutAtOptions, @@ -6162,14 +6162,14 @@ cache.

    ostree_repo_checkout_at ()

    -
    gboolean
+
    gboolean
 ostree_repo_checkout_at (OstreeRepo *self,
                          OstreeRepoCheckoutAtOptions *options,
                          int destination_dfd,
                          const char *destination_path,
                          const char *commit,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);

    Similar to ostree_repo_checkout_tree(), but uses directory-relative paths for the destination, uses a new OstreeRepoCheckoutAtOptions, and takes a commit checksum and optional subpath pair, rather than @@ -6231,10 +6231,10 @@ cache.

    ostree_repo_checkout_gc ()

    -
    gboolean
+
    gboolean
 ostree_repo_checkout_gc (OstreeRepo *self,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);

    Call this after finishing a succession of checkout operations; it will delete any currently-unused uncompressed objects from the cache.

    @@ -6269,13 +6269,13 @@ cache.

    ostree_repo_read_commit ()

    -
    gboolean
+
    gboolean
 ostree_repo_read_commit (OstreeRepo *self,
                          const char *ref,
-                         GFile **out_root,
+                         GFile **out_root,
                          char **out_commit,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);

    Load the content for rev into out_root .

    @@ -6325,18 +6325,18 @@ ostree_repo_read_commit (

    ostree_repo_list_objects ()

    -
    gboolean
+
    gboolean
 ostree_repo_list_objects (OstreeRepo *self,
                           OstreeRepoListObjectsFlags flags,
-                          GHashTable **out_objects,
-                          GCancellable *cancellable,
-                          GError **error);
    
+                          GHashTable **out_objects,
+                          GCancellable *cancellable,
+                          GError **error);

    This function synchronously enumerates all objects in the repository, returning data in out_objects . out_objects maps from keys returned by ostree_object_name_serialize() -to GVariant values of type OSTREE_REPO_LIST_OBJECTS_VARIANT_TYPE.

    +to GVariant values of type OSTREE_REPO_LIST_OBJECTS_VARIANT_TYPE.

    Parameters

    out_metadata

    Metadata associated with commit in with format "a{sv}", or NULL if none exists.

    Metadata associated with commit in with format "a{sv}", or NULL if none exists.

    		[out][transfer full]

    metadata

    Metadata to associate with commit in with format "a{sv}", or NULL to delete.

    Metadata to associate with commit in with format "a{sv}", or NULL to delete.

    		[allow-none]
    @@ -6376,20 +6376,20 @@ to

    Returns

    -

    TRUE on success, FALSE on error, and error +

    TRUE on success, FALSE on error, and error will be set

    ostree_repo_list_commit_objects_starting_with ()

    -
    gboolean
+
    gboolean
 ostree_repo_list_commit_objects_starting_with
                                (OstreeRepo *self,
                                 const char *start,
-                                GHashTable **out_commits,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GHashTable **out_commits,
+                                GCancellable *cancellable,
+                                GError **error);

    This function synchronously enumerates all commit objects starting with start , returning data in out_commits @@ -6433,18 +6433,18 @@ with start

    Returns

    -

    TRUE on success, FALSE on error, and error +

    TRUE on success, FALSE on error, and error will be set

    ostree_repo_list_static_delta_names ()

    -
    gboolean
+
    gboolean
 ostree_repo_list_static_delta_names (OstreeRepo *self,
-                                     GPtrArray **out_deltas,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     GPtrArray **out_deltas,
+                                     GCancellable *cancellable,
+                                     GError **error);

    This function synchronously enumerates all static deltas in the repository, returning its result in out_deltas .

    @@ -6484,11 +6484,11 @@ repository, returning its result in out_deltas

    ostree_repo_list_static_delta_indexes ()

    -
    gboolean
+
    gboolean
 ostree_repo_list_static_delta_indexes (OstreeRepo *self,
-                                       GPtrArray **out_indexes,
-                                       GCancellable *cancellable,
-                                       GError **error);
    
+                                       GPtrArray **out_indexes,
+                                       GCancellable *cancellable,
+                                       GError **error);

    This function synchronously enumerates all static delta indexes in the repository, returning its result in out_indexes .

    @@ -6529,18 +6529,18 @@ repository, returning its result in out_indexes

    ostree_repo_static_delta_reindex ()

    -
    gboolean
+
    gboolean
 ostree_repo_static_delta_reindex (OstreeRepo *repo,
                                   OstreeStaticDeltaIndexFlags flags,
                                   const char *opt_to_commit,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  GCancellable *cancellable,
+                                  GError **error);

    The delta index for a particular commit lists all the existing deltas that can be used when downloading that commit. This operation regenerates these indexes, either for a particular commit (if opt_to_commit - is non-NULL), or for all commits that + is non-NULL), or for all commits that are reachable by an existing delta (if opt_to_commit - is NULL).

    + is NULL).

    This is normally called automatically when the summary is updated in ostree_repo_regenerate_summary().

    Locking: shared

    @@ -6564,7 +6564,7 @@ are reachable by an existing delta (if opt_to_commit
    - + @@ -6584,17 +6584,17 @@ are reachable by an existing delta (if opt_to_commit

    ostree_repo_static_delta_generate ()

    -
    gboolean
+
    gboolean
 ostree_repo_static_delta_generate (OstreeRepo *self,
                                    OstreeStaticDeltaGenerateOpt opt,
                                    const char *from,
                                    const char *to,
-                                   GVariant *metadata,
-                                   GVariant *params,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GVariant *metadata,
+                                   GVariant *params,
+                                   GCancellable *cancellable,
+                                   GError **error);

    Generate a lookaside "static delta" from from - (NULL means + (NULL means from-empty) which can generate the objects in to . This delta is an optimization over fetching individual objects, and can be @@ -6637,7 +6637,7 @@ for input files

     - + @@ -6672,14 +6672,14 @@ for input files

    ostree_repo_static_delta_execute_offline_with_signature ()

    -
    gboolean
+
    gboolean
 ostree_repo_static_delta_execute_offline_with_signature
                                (OstreeRepo *self,
-                                GFile *dir_or_file,
+                                GFile *dir_or_file,
                                 OstreeSign *sign,
-                                gboolean skip_validation,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                gboolean skip_validation,
+                                GCancellable *cancellable,
+                                GError **error);

    Given a directory representing an already-downloaded static delta on disk, apply it, generating a new commit. If sign is passed, the static delta signature is verified. @@ -6714,7 +6714,7 @@ one part.

     - + @@ -6735,13 +6735,13 @@ one part.

    ostree_repo_static_delta_execute_offline ()

    -
    gboolean
+
    gboolean
 ostree_repo_static_delta_execute_offline
                                (OstreeRepo *self,
-                                GFile *dir_or_file,
-                                gboolean skip_validation,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GFile *dir_or_file,
+                                gboolean skip_validation,
+                                GCancellable *cancellable,
+                                GError **error);

    Given a directory representing an already-downloaded static delta on disk, apply it, generating a new commit. The directory must be named with the form "FROM-TO", where both are checksums, and it @@ -6767,7 +6767,7 @@ must contain a file named "superblock", along with at least one part.

     - + @@ -6787,13 +6787,13 @@ must contain a file named "superblock", along with at least one part.

    ostree_repo_static_delta_verify_signature ()

    -
    gboolean
+
    gboolean
 ostree_repo_static_delta_verify_signature
                                (OstreeRepo *self,
                                 const char *delta_id,
                                 OstreeSign *sign,
                                 char **out_success_message,
-                                GError **error);
    
+                                GError **error);

    Verify static delta file signature.

    Parameters

    @@ -6842,9 +6842,9 @@ signature engine provided, FALSE otherwise.

    ostree_repo_traverse_new_reachable ()

    -
    GHashTable *
+
    GHashTable *
 ostree_repo_traverse_new_reachable (void);
    
-
    This hash table is a set of GVariant which can be accessed via
+
    This hash table is a set of GVariant which can be accessed via
 ostree_object_name_deserialize().
    
 
    
 
    Returns
    
@@ -6855,11 +6855,11 @@ ostree_repo_traverse_new_reachable (
 
    ostree_repo_traverse_new_parents ()
    
-
    GHashTable *
+
    GHashTable *
 ostree_repo_traverse_new_parents (void);
    
-
    This hash table is a mapping from GVariant which can be accessed
-via ostree_object_name_deserialize() to a GVariant containing either
-a similar GVariant or and array of them, listing the parents of the key.
    
+
    This hash table is a mapping from GVariant which can be accessed
+via ostree_object_name_deserialize() to a GVariant containing either
+a similar GVariant or and array of them, listing the parents of the key.
    
 
    
 
    Returns
    
 
    A new hash table. 
    
@@ -6872,8 +6872,8 @@ a similar 
    ostree_repo_traverse_parents_get_commits ()
    
 
    char **
 ostree_repo_traverse_parents_get_commits
-                               (GHashTable *parents,
-                                GVariant *object);
    
+                               (GHashTable *parents,
+                                GVariant *object);
    
 
    Gets all the commits that a certain object belongs to, as recorded
 by a parents table gotten from ostree_repo_traverse_commit_union_with_parents.
    
 
    
@@ -6887,13 +6887,13 @@ the commits the key belongs to. 
    
 
    
 
    
 
    ostree_repo_traverse_commit ()
    
-
    gboolean
+
    gboolean
 ostree_repo_traverse_commit (OstreeRepo *repo,
                              const char *commit_checksum,
                              int maxdepth,
-                             GHashTable **out_reachable,
-                             GCancellable *cancellable,
-                             GError **error);
    
+                             GHashTable **out_reachable,
+                             GCancellable *cancellable,
+                             GError **error);
    
 
    Create a new set out_reachable
  containing all objects reachable
 from commit_checksum
@@ -6945,13 +6945,13 @@ from commit_checksum
 
    
 
    
 
    ostree_repo_traverse_commit_union ()
    
-
    gboolean
+
    gboolean
 ostree_repo_traverse_commit_union (OstreeRepo *repo,
                                    const char *commit_checksum,
                                    int maxdepth,
-                                   GHashTable *inout_reachable,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GHashTable *inout_reachable,
+                                   GCancellable *cancellable,
+                                   GError **error);
    
 
    Update the set inout_reachable
  containing all objects reachable
 from commit_checksum
@@ -7004,15 +7004,15 @@ from commit_checksum
 
    
 
    
 
    ostree_repo_traverse_commit_union_with_parents ()
    
-
    gboolean
+
    gboolean
 ostree_repo_traverse_commit_union_with_parents
                                (OstreeRepo *repo,
                                 const char *commit_checksum,
                                 int maxdepth,
-                                GHashTable *inout_reachable,
-                                GHashTable *inout_parents,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GHashTable *inout_reachable,
+                                GHashTable *inout_parents,
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Update the set inout_reachable
  containing all objects reachable
 from commit_checksum
@@ -7172,13 +7172,13 @@ called if 
 
    ostree_repo_commit_traverse_iter_init_commit ()
    
-
    gboolean
+
    gboolean
 ostree_repo_commit_traverse_iter_init_commit
                                (OstreeRepoCommitTraverseIter *iter,
                                 OstreeRepo *repo,
-                                GVariant *commit,
+                                GVariant *commit,
                                 OstreeRepoCommitTraverseFlags flags,
-                                GError **error);
    
+                                GError **error);
    
 
    Initialize (in place) an iterator over the root of a commit object.
    
 
    
 
    Parameters
    
@@ -7221,13 +7221,13 @@ ostree_repo_commit_traverse_iter_init_commit
 
    
 
    
 
    ostree_repo_commit_traverse_iter_init_dirtree ()
    
-
    gboolean
+
    gboolean
 ostree_repo_commit_traverse_iter_init_dirtree
                                (OstreeRepoCommitTraverseIter *iter,
                                 OstreeRepo *repo,
-                                GVariant *dirtree,
+                                GVariant *dirtree,
                                 OstreeRepoCommitTraverseFlags flags,
-                                GError **error);
    
+                                GError **error);
    
 
    Initialize (in place) an iterator over a directory tree.
    
 
    
 
    Parameters
    
@@ -7272,8 +7272,8 @@ ostree_repo_commit_traverse_iter_init_dirtree
 
    ostree_repo_commit_traverse_iter_next ()
    
 
    OstreeRepoCommitIterResult
 ostree_repo_commit_traverse_iter_next (OstreeRepoCommitTraverseIter *iter,
-                                       GCancellable *cancellable,
-                                       GError **error);
    
+                                       GCancellable *cancellable,
+                                       GError **error);

    Step the interator to the next item. Files will be returned first, then subdirectories. Call this in a loop; upon encountering OSTREE_REPO_COMMIT_ITER_RESULT_END, there will be no more files or @@ -7317,15 +7317,15 @@ program error to call any further API on iter

    ostree_repo_prune ()

    -
    gboolean
+
    gboolean
 ostree_repo_prune (OstreeRepo *self,
                    OstreeRepoPruneFlags flags,
-                   gint depth,
-                   gint *out_objects_total,
-                   gint *out_objects_pruned,
-                   guint64 *out_pruned_object_size_total,
-                   GCancellable *cancellable,
-                   GError **error);
    
+                   gint depth,
+                   gint *out_objects_total,
+                   gint *out_objects_pruned,
+                   guint64 *out_pruned_object_size_total,
+                   GCancellable *cancellable,
+                   GError **error);

    Delete content from the repository. By default, this function will only delete "orphaned" objects not referred to by any commit. This can happen during a local commit operation, when we have written @@ -7395,11 +7395,11 @@ deleting them.

    ostree_repo_prune_static_deltas ()

    -
    gboolean
+
    gboolean
 ostree_repo_prune_static_deltas (OstreeRepo *self,
                                  const char *commit,
-                                 GCancellable *cancellable,
-                                 GError **error);
    
+                                 GCancellable *cancellable,
+                                 GError **error);

    Prune static deltas, if COMMIT is specified then delete static delta files only targeting that commit; otherwise any static delta of non existing commits are deleted.

    @@ -7420,7 +7420,7 @@ deleted.

     - @@ -7441,12 +7441,12 @@ non existing commit.

    ostree_repo_traverse_reachable_refs ()

    -
    gboolean
+
    gboolean
 ostree_repo_traverse_reachable_refs (OstreeRepo *self,
-                                     guint depth,
-                                     GHashTable *reachable,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     guint depth,
+                                     GHashTable *reachable,
+                                     GCancellable *cancellable,
+                                     GError **error);

    Add all commit objects directly reachable via a ref to reachable .

    Locking: shared

    @@ -7492,14 +7492,14 @@ ostree_repo_traverse_reachable_refs (

    ostree_repo_prune_from_reachable ()

    -
    gboolean
+
    gboolean
 ostree_repo_prune_from_reachable (OstreeRepo *self,
                                   OstreeRepoPruneOptions *options,
-                                  gint *out_objects_total,
-                                  gint *out_objects_pruned,
-                                  guint64 *out_pruned_object_size_total,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  gint *out_objects_total,
+                                  gint *out_objects_pruned,
+                                  guint64 *out_pruned_object_size_total,
+                                  GCancellable *cancellable,
+                                  GError **error);

    Delete content from the repository. This function is the "backend" half of the higher level ostree_repo_prune(). To use this function, you determine the root set yourself, and this function finds all other @@ -7562,14 +7562,14 @@ statistics on objects that would be deleted, without actually deleting them.

    ostree_repo_pull ()

    -
    gboolean
+
    gboolean
 ostree_repo_pull (OstreeRepo *self,
                   const char *remote_name,
                   char **refs_to_fetch,
                   OstreeRepoPullFlags flags,
                   OstreeAsyncProgress *progress,
-                  GCancellable *cancellable,
-                  GError **error);
    
+                  GCancellable *cancellable,
+                  GError **error);

    Connect to the remote repository, fetching the specified set of refs refs_to_fetch . For each ref that is changed, download the @@ -7579,7 +7579,7 @@ on disk in self

    If flags contains OSTREE_REPO_PULL_FLAGS_MIRROR, and the refs_to_fetch - is NULL, and the remote repository contains a + is NULL, and the remote repository contains a summary file, then all refs will be fetched.

    If flags contains OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY, then only the @@ -7587,7 +7587,7 @@ metadata for the commits in refs_to_fetch

    Warning: This API will iterate the thread default main context, which is a bug, but kept for compatibility reasons. If you want to -avoid this, use g_main_context_push_thread_default() to push a new +avoid this, use g_main_context_push_thread_default() to push a new one around this call.

    Parameters

    @@ -7610,7 +7610,7 @@ one around this call.

     - + @@ -7640,15 +7640,15 @@ one around this call.

    ostree_repo_pull_one_dir ()

    -
    gboolean
+
    gboolean
 ostree_repo_pull_one_dir (OstreeRepo *self,
                           const char *remote_name,
                           const char *dir_to_pull,
                           char **refs_to_fetch,
                           OstreeRepoPullFlags flags,
                           OstreeAsyncProgress *progress,
-                          GCancellable *cancellable,
-                          GError **error);
    
+                          GCancellable *cancellable,
+                          GError **error);

    This is similar to ostree_repo_pull(), but only fetches a single subpath.

    @@ -7677,7 +7677,7 @@ subpath.

     - + @@ -7707,13 +7707,13 @@ subpath.

    ostree_repo_pull_with_options ()

    -
    gboolean
+
    gboolean
 ostree_repo_pull_with_options (OstreeRepo *self,
                                const char *remote_name_or_baseurl,
-                               GVariant *options,
+                               GVariant *options,
                                OstreeAsyncProgress *progress,
-                               GCancellable *cancellable,
-                               GError **error);
    
+                               GCancellable *cancellable,
+                               GError **error);

    Like ostree_repo_pull(), but supports an extensible set of flags. The following are currently defined:

      @@ -7797,7 +7797,7 @@ will be verified with the keyring of the remote being pulled from.

    opt_to_commit

    ASCII SHA256 checksum of target commit, or NULL to index all targets

    ASCII SHA256 checksum of target commit, or NULL to index all targets

    		  

    from

    ASCII SHA256 checksum of origin, or NULL.

    ASCII SHA256 checksum of origin, or NULL.

    		[nullable]

    skip_validation

    If TRUE, assume data integrity

    If TRUE, assume data integrity

    		  

    skip_validation

    If TRUE, assume data integrity

    If TRUE, assume data integrity

    		  

    commit

    ASCII SHA256 checksum for commit, or NULL for each +

    ASCII SHA256 checksum for commit, or NULL for each non existing commit.

    		[allow-none]

    refs_to_fetch

    Optional list of refs; if NULL, fetch all configured refs.

    Optional list of refs; if NULL, fetch all configured refs.

    		[array zero-terminated=1][element-type utf8][allow-none]

    refs_to_fetch

    Optional list of refs; if NULL, fetch all configured refs.

    Optional list of refs; if NULL, fetch all configured refs.

    		[array zero-terminated=1][element-type utf8][allow-none]
    -

    Since: 2019.2

    +

    Since: 2020.9

    @@ -7805,7 +7805,7 @@ will be verified with the keyring of the remote being pulled from.

    void
 ostree_repo_pull_default_console_progress_changed
                                (OstreeAsyncProgress *progress,
-                                gpointer user_data);
    + gpointer user_data);

    Convenient "changed" callback for use with ostree_async_progress_new_and_connect() when pulling from a remote repository.

    @@ -7844,13 +7844,13 @@ and user_data

    ostree_repo_sign_commit ()

    -
    gboolean
+
    gboolean
 ostree_repo_sign_commit (OstreeRepo *self,
-                         const gchar *commit_checksum,
-                         const gchar *key_id,
-                         const gchar *homedir,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         const gchar *commit_checksum,
+                         const gchar *key_id,
+                         const gchar *homedir,
+                         GCancellable *cancellable,
+                         GError **error);

    Add a GPG signature to a commit.

    Parameters

    @@ -7878,17 +7878,17 @@ ostree_repo_sign_commit (

    homedir

    GPG home directory, or NULL.

    GPG home directory, or NULL.

    		[allow-none]

    cancellable

    A GCancellable

    A GCancellable

    		  

    error

    a GError

    a GError

    		  

    cancellable

    A GCancellable

    A GCancellable

    		  

    error

    a GError

    a GError

    		  

    GPG home directory, or NULL.

    GPG home directory, or NULL.

    		[allow-none]

    cancellable

    A GCancellable

    A GCancellable

    		  

    error

    a GError

    a GError

    		  

    data

    Data as a GBytes

    Data as a GBytes

    		  

    old_signatures

    Existing signatures to append to (or NULL)

    Existing signatures to append to (or NULL)

    		  

    homedir

    GPG home directory, or NULL.

    GPG home directory, or NULL.

    		[allow-none]

    cancellable

    A GCancellable

    A GCancellable

    		  

    error

    a GError

    a GError

    		  

    data

    Data as a GBytes

    Data as a GBytes

    		  

    signatures

    Signatures as a GBytes

    Signatures as a GBytes

    		  

    Summary data as a GBytes

    Summary data as a GBytes

    		  

    signatures

    Summary signatures as a GBytes

    Summary signatures as a GBytes

    		  

    additional_metadata

    A GVariant of type a{sv}, or NULL.

    A GVariant of type a{sv}, or NULL.

    		[allow-none]

    guint metadata_objects_total;

    guint metadata_objects_total;

    The total number of metadata objects in the repository after this transaction has completed.

    		  

    guint metadata_objects_written;

    guint metadata_objects_written;

    The number of metadata objects that were written to the repository in this transaction.

    		  

    guint content_objects_total;

    guint content_objects_total;

    The total number of content objects in the repository after this transaction has completed.

    		  

    guint content_objects_written;

    guint content_objects_written;

    The number of content objects that were written to the repository in this transaction.

    		  

    guint64 content_bytes_written;

    guint64 content_bytes_written;

    The amount of data added to the repository, in bytes, counting only content objects.

    		  

    guint devino_cache_hits;

    guint devino_cache_hits;

    		    

    guint padding1;

    guint padding1;

    reserved

    		  

    guint64 padding2;

    guint64 padding2;

    reserved

    		  

    guint64 padding3;

    guint64 padding3;

    reserved

    		  

    guint64 padding4;

    guint64 padding4;

    reserved

    		  
    -GVariant * +GVariant * ostree_async_progress_get_variant () @@ -89,7 +89,7 @@
    -guint +guint ostree_async_progress_get_uint () @@ -97,7 +97,7 @@
    -guint64 +guint64 ostree_async_progress_get_uint64 () @@ -179,7 +179,7 @@ handles thread safety, ensuring that the progress change notification occurs in the thread-default context of the calling operation.

    The ostree_async_progress_get_status() and ostree_async_progress_set_status() -methods get and set a well-known status key of type G_VARIANT_TYPE_STRING. +methods get and set a well-known status key of type G_VARIANT_TYPE_STRING. This key may be accessed using the other OstreeAsyncProgress methods, but it must always have the correct type.

    @@ -200,7 +200,7 @@ ostree_async_progress_new (void

    ostree_async_progress_new_and_connect ()

    OstreeAsyncProgress *
 ostree_async_progress_new_and_connect (void (*changed) (OstreeAsyncProgress *self, gpointer user_data),
-                                       gpointer user_data);
    + gpointer user_data);
    @@ -212,7 +212,7 @@ ostree_async_progress_copy_state (dest , without invoking the callback. -This is used for proxying progress objects across different GMainContexts.

    +This is used for proxying progress objects across different GMainContexts.

    Parameters

    @@ -243,7 +243,7 @@ This is used for proxying progress objects across different char * ostree_async_progress_get_status (OstreeAsyncProgress *self);

    Get the human-readable status string from the OstreeAsyncProgress. This -operation is thread-safe. The retuned value may be NULL if no status is +operation is thread-safe. The retuned value may be NULL if no status is set.

    This is a convenience function to get the well-known status key.

    @@ -263,7 +263,7 @@ set.

    Returns

    -

    the current status, or NULL if none is set.

    +

    the current status, or NULL if none is set.

    [transfer full][nullable]

    Since: 2017.6

    @@ -276,9 +276,9 @@ ostree_async_progress_get (...);

    Get the values corresponding to zero or more keys from the OstreeAsyncProgress. Each key is specified in @... as the key name, followed -by a GVariant format string, followed by the necessary arguments for that -format string, just as for g_variant_get(). After those arguments is the -next key name. The varargs list must be NULL-terminated.

    +by a GVariant format string, followed by the necessary arguments for that +format string, just as for g_variant_get(). After those arguments is the +next key name. The varargs list must be NULL-terminated.

    Each format string must make deep copies of its value, as the values stored in the OstreeAsyncProgress may be freed from another thread after this function returns.

    @@ -331,7 +331,7 @@ function returns.

     - + @@ -342,10 +342,10 @@ function returns.

    ostree_async_progress_get_variant ()

    -
    GVariant *
+
    GVariant *
 ostree_async_progress_get_variant (OstreeAsyncProgress *self,
                                    const char *key);
    
-
    Look up a key in the OstreeAsyncProgress and return the GVariant associated
+
    Look up a key in the OstreeAsyncProgress and return the GVariant associated
 with it. The lookup is thread-safe.
    
 
    
 
    Parameters
    
@@ -372,7 +372,7 @@ with it. The lookup is thread-safe.
    
 
    
 
    Returns
    
 
    value for the given key
-, or NULL if
+, or NULL if
 it was not set. 
    
 
    [transfer full][nullable]
    
 
    
@@ -381,14 +381,14 @@ it was not set. 
    
 
    
 
    
 
    ostree_async_progress_get_uint ()
    
-
    guint
+
    guint
 ostree_async_progress_get_uint (OstreeAsyncProgress *self,
                                 const char *key);
    
 
    
 
    
 
    
 
    ostree_async_progress_get_uint64 ()
    
-
    guint64
+
    guint64
 ostree_async_progress_get_uint64 (OstreeAsyncProgress *self,
                                   const char *key);
    
 
    
@@ -399,7 +399,7 @@ ostree_async_progress_get_uint64 (OstreeAsyncProgress *self,
                                   const char *status);

    Set the human-readable status string for the OstreeAsyncProgress. This -operation is thread-safe. NULL may be passed to clear the status.

    +operation is thread-safe. NULL may be passed to clear the status.

    This is a convenience function to set the well-known status key.

    Parameters

    @@ -417,7 +417,7 @@ operation is thread-safe.

    status

    -
     + @@ -432,11 +432,11 @@ operation is thread-safe. OstreeAsyncProgress *self, ...);

    Set the values for zero or more keys in the OstreeAsyncProgress. Each key is -specified in @... as the key name, followed by a GVariant format string, +specified in @... as the key name, followed by a GVariant format string, followed by the necessary arguments for that format string, just as for -g_variant_new(). After those arguments is the next key name. The varargs list -must be NULL-terminated.

    -

    g_variant_ref_sink() will be called as appropriate on the GVariant +g_variant_new(). After those arguments is the next key name. The varargs list +must be NULL-terminated.

    +

    g_variant_ref_sink() will be called as appropriate on the GVariant parameters, so they may be floating.

    This operation is thread-safe, and all the keys are set atomically.

    @@ -483,7 +483,7 @@ parameters, so they may be floating.

     - + @@ -497,13 +497,13 @@ parameters, so they may be floating.

    void
 ostree_async_progress_set_variant (OstreeAsyncProgress *self,
                                    const char *key,
-                                   GVariant *value);
    + GVariant *value);

    Assign a new value to the given key , replacing any existing value. The operation is thread-safe. value may be a floating reference; -g_variant_ref_sink() will be called on it.

    +g_variant_ref_sink() will be called on it.

    Any watchers of the OstreeAsyncProgress will be notified of the change if value differs from the existing value for key @@ -544,7 +544,7 @@ operation is thread-safe. value 

    void
 ostree_async_progress_set_uint (OstreeAsyncProgress *self,
                                 const char *key,
-                                guint value);
    + guint value);
    @@ -552,7 +552,7 @@ ostree_async_progress_set_uint (void ostree_async_progress_set_uint64 (OstreeAsyncProgress *self, const char *key, - guint64 value); + guint64 value);
    @@ -589,6 +589,6 @@ events will be queued.

    -
    Generated by GTK-Doc V1.33.0
    +
    Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/apidoc/html/ostree-Root-partition-mount-point.html b/apidoc/html/ostree-Root-partition-mount-point.html index 4cbfef91..4bbdee60 100644 --- a/apidoc/html/ostree-Root-partition-mount-point.html +++ b/apidoc/html/ostree-Root-partition-mount-point.html @@ -8,7 +8,7 @@ - + @@ -57,7 +57,7 @@     + + + + - @@ -487,9 +495,9 @@ ostree_sysroot_new_default (void<

    ostree_sysroot_initialize ()

    -
    gboolean
+
    gboolean
 ostree_sysroot_initialize (OstreeSysroot *self,
-                           GError **error);
    
+                           GError **error);

    Subset of ostree_sysroot_load(); performs basic initialization. Notably, one can invoke ostree_sysroot_get_fd() after calling this function.

    It is not necessary to call this function if ostree_sysroot_load() is @@ -514,7 +522,7 @@ invoked.

    ostree_sysroot_get_path ()

    -
    GFile *
+
    GFile *
 ostree_sysroot_get_path (OstreeSysroot *self);
    
 
    
 
    Parameters
    
@@ -540,10 +548,10 @@ ostree_sysroot_get_path (
 
    ostree_sysroot_load ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_load (OstreeSysroot *self,
-                     GCancellable *cancellable,
-                     GError **error);
    
+                     GCancellable *cancellable,
+                     GError **error);
    
 
    Load deployment list, bootversion, and subbootversion from the
 rootfs self
 .
    
@@ -578,11 +586,11 @@ rootfs self
 
    
 
    
 
    ostree_sysroot_load_if_changed ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_load_if_changed (OstreeSysroot *self,
-                                gboolean *out_changed,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                gboolean *out_changed,
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    
 
    Parameters

    ...

    key name, format string, GVariant return locations, …, followed by NULL

    key name, format string, GVariant return locations, …, followed by NULL

    		  

    new status string, or NULL to clear the status.

    new status string, or NULL to clear the status.

    		[nullable]

    ...

    key name, format string, GVariant parameters, …, followed by NULL

    key name, format string, GVariant parameters, …, followed by NULL

    		  
    -gboolean +gboolean ostree_sysroot_initialize () @@ -65,7 +65,7 @@
    -GFile * +GFile * ostree_sysroot_get_path () @@ -73,7 +73,7 @@
    -gboolean +gboolean ostree_sysroot_load () @@ -81,7 +81,7 @@
    -gboolean +gboolean ostree_sysroot_load_if_changed () @@ -89,7 +89,7 @@
    -gboolean +gboolean ostree_sysroot_lock () @@ -97,7 +97,7 @@
    -gboolean +gboolean ostree_sysroot_try_lock () @@ -113,7 +113,7 @@
    -gboolean +gboolean ostree_sysroot_lock_finish () @@ -145,7 +145,7 @@
    -gboolean +gboolean ostree_sysroot_is_booted () @@ -161,7 +161,7 @@
    -gboolean +gboolean ostree_sysroot_ensure_initialized () @@ -185,7 +185,7 @@
    -GPtrArray * +GPtrArray * ostree_sysroot_get_deployments () @@ -201,7 +201,15 @@
    -GFile * +OstreeDeployment * + +ostree_sysroot_require_booted_deployment () +
    +GFile * ostree_sysroot_get_deployment_directory () @@ -217,7 +225,7 @@
    -GFile * +GFile * ostree_sysroot_get_deployment_origin_path () @@ -225,7 +233,7 @@
    -gboolean +gboolean ostree_sysroot_cleanup () @@ -233,7 +241,7 @@
    -gboolean +gboolean ostree_sysroot_prepare_cleanup () @@ -241,7 +249,7 @@
    -gboolean +gboolean ostree_sysroot_cleanup_prune_repo () @@ -257,7 +265,7 @@
    -gboolean +gboolean ostree_sysroot_get_repo () @@ -273,7 +281,7 @@
    -gboolean +gboolean ostree_sysroot_init_osname () @@ -281,7 +289,7 @@
    -gboolean +gboolean ostree_sysroot_deployment_set_kargs () @@ -289,7 +297,7 @@
    -gboolean +gboolean ostree_sysroot_deployment_set_mutable () @@ -297,7 +305,7 @@
    -gboolean +gboolean ostree_sysroot_deployment_unlock () @@ -305,7 +313,7 @@
    -gboolean +gboolean ostree_sysroot_deployment_set_pinned () @@ -313,7 +321,7 @@
    -gboolean +gboolean ostree_sysroot_write_deployments () @@ -321,7 +329,7 @@
    -gboolean +gboolean ostree_sysroot_write_deployments_with_options () @@ -329,7 +337,7 @@
    -gboolean +gboolean ostree_sysroot_write_origin_file () @@ -337,7 +345,7 @@
    -gboolean +gboolean ostree_sysroot_stage_tree () @@ -345,7 +353,7 @@
    -gboolean +gboolean ostree_sysroot_stage_tree_with_options () @@ -353,7 +361,7 @@
    -gboolean +gboolean ostree_sysroot_stage_overlay_initrd () @@ -361,7 +369,7 @@
    -gboolean +gboolean ostree_sysroot_deploy_tree () @@ -369,7 +377,7 @@
    -gboolean +gboolean ostree_sysroot_deploy_tree_with_options () @@ -393,7 +401,7 @@
    -GKeyFile * +GKeyFile * ostree_sysroot_origin_new_from_refspec () @@ -401,7 +409,7 @@
    -gboolean +gboolean ostree_sysroot_simple_write_deployment () @@ -444,10 +452,10 @@ perform locking externally.

    ostree_sysroot_new ()

    OstreeSysroot *
-ostree_sysroot_new (GFile *path);
    +ostree_sysroot_new (GFile *path);

    Create a new OstreeSysroot object for the sysroot at path . If path - is NULL, + is NULL, the current visible root file system is used, equivalent to ostree_sysroot_new_default().

    @@ -460,7 +468,7 @@ the current visible root file system is used, equivalent to

    path

    Path to a system root directory, or NULL to use the +

    Path to a system root directory, or NULL to use the current visible root file system.

    		[allow-none]
    @@ -620,9 +628,9 @@ ostree_sysroot_load_if_changed (

    ostree_sysroot_lock ()

    -
    gboolean
+
    gboolean
 ostree_sysroot_lock (OstreeSysroot *self,
-                     GError **error);
    
+                     GError **error);

    Acquire an exclusive multi-process write lock for self . This call blocks until the lock has been acquired. The lock is not @@ -656,15 +664,15 @@ be released if self

    ostree_sysroot_try_lock ()

    -
    gboolean
+
    gboolean
 ostree_sysroot_try_lock (OstreeSysroot *self,
-                         gboolean *out_acquired,
-                         GError **error);
    
+                         gboolean *out_acquired,
+                         GError **error);

    Try to acquire an exclusive multi-process write lock for self . If another process holds the lock, this function will return immediately, setting out_acquired - to FALSE, and returning TRUE + to FALSE, and returning TRUE (and no error).

    Release the lock with ostree_sysroot_unlock(). The lock will also be released if self @@ -702,9 +710,9 @@ be released if self

    ostree_sysroot_lock_async ()

    void
 ostree_sysroot_lock_async (OstreeSysroot *self,
-                           GCancellable *cancellable,
-                           GAsyncReadyCallback callback,
-                           gpointer user_data);
    + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

    An asynchronous version of ostree_sysroot_lock().

    Parameters

    @@ -742,10 +750,10 @@ ostree_sysroot_lock_async (

    ostree_sysroot_lock_finish ()

    -
    gboolean
+
    gboolean
 ostree_sysroot_lock_finish (OstreeSysroot *self,
-                            GAsyncResult *result,
-                            GError **error);
    
+                            GAsyncResult *result,
+                            GError **error);

    Call when ostree_sysroot_lock_async() is ready.

    Parameters

    @@ -846,7 +854,7 @@ be invoked before or after

    ostree_sysroot_is_booted ()

    -
    gboolean
+
    gboolean
 ostree_sysroot_is_booted (OstreeSysroot *self);
    
 
    Can only be invoked after ostree_sysroot_initialize().
    
 
    
@@ -866,7 +874,7 @@ ostree_sysroot_is_booted (
 
    Returns
    
-
     TRUE iff the sysroot points to a booted deployment
    
+
     TRUE iff the sysroot points to a booted deployment
    
 
    
 
    Since: 2020.1
    @@ -902,10 +910,10 @@ prior to calling this function.

    ostree_sysroot_ensure_initialized ()

    -
    gboolean
+
    gboolean
 ostree_sysroot_ensure_initialized (OstreeSysroot *self,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GCancellable *cancellable,
+                                   GError **error);

    Ensure that self is set up as a valid rootfs, by creating /ostree/repo, among other things.

    @@ -952,7 +960,7 @@ ostree_sysroot_get_subbootversion (

    ostree_sysroot_get_deployments ()

    -
    GPtrArray *
+
    GPtrArray *
 ostree_sysroot_get_deployments (OstreeSysroot *self);
    
 
    
 
    Parameters
    
@@ -997,14 +1005,44 @@ ostree_sysroot_get_booted_deployment (
 
    Returns
    
-
    The currently booted deployment, or NULL if none. 
    
+
    The currently booted deployment, or NULL if none. 
    
 
    [transfer none][nullable]
    +

    ostree_sysroot_require_booted_deployment ()

    +
    OstreeDeployment *
+ostree_sysroot_require_booted_deployment
+                               (OstreeSysroot *self,
+                                GError **error);
    +

    Find the booted deployment, or return an error if not booted via OSTree.

    +
    +

    Parameters

    +
    +++++ + + + + + +

    self

    Sysroot

    		 
    +
    +
    +

    Returns

    +

    The currently booted deployment, or an error.

    +

    [transfer none][not nullable]

    +
    +

    Since: 2021.1

    +
    +
    +

    ostree_sysroot_get_deployment_directory ()

    -
    GFile *
+
    GFile *
 ostree_sysroot_get_deployment_directory
                                (OstreeSysroot *self,
                                 OstreeDeployment *deployment);
    
@@ -1076,9 +1114,9 @@ or concatenate it with the full 
 
    ostree_sysroot_get_deployment_origin_path ()
    
-
    GFile *
+
    GFile *
 ostree_sysroot_get_deployment_origin_path
-                               (GFile *deployment_path);
    
+                               (GFile *deployment_path);
    
 
    
 
    Parameters
    
 
    
@@ -1103,10 +1141,10 @@ ostree_sysroot_get_deployment_origin_path
 
    
 
    ostree_sysroot_cleanup ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_cleanup (OstreeSysroot *self,
-                        GCancellable *cancellable,
-                        GError **error);
    
+                        GCancellable *cancellable,
+                        GError **error);
    
 
    Delete any state that resulted from a partially completed
 transaction, such as incomplete deployments.
    
 
    
@@ -1140,10 +1178,10 @@ transaction, such as incomplete deployments.
    
 
    
 
    
 
    ostree_sysroot_prepare_cleanup ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_prepare_cleanup (OstreeSysroot *self,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Like ostree_sysroot_cleanup() in that it cleans up incomplete deployments
 and old boot versions, but does NOT prune the repository.
    
 
    
@@ -1177,14 +1215,14 @@ and old boot versions, but does NOT prune the repository.
    
 
    
 
    
 
    ostree_sysroot_cleanup_prune_repo ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_cleanup_prune_repo (OstreeSysroot *sysroot,
                                    OstreeRepoPruneOptions *options,
-                                   gint *out_objects_total,
-                                   gint *out_objects_pruned,
-                                   guint64 *out_pruned_object_size_total,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   gint *out_objects_total,
+                                   gint *out_objects_pruned,
+                                   guint64 *out_pruned_object_size_total,
+                                   GCancellable *cancellable,
+                                   GError **error);
    
 
    Prune the system repository.  This is a thin wrapper
 around ostree_repo_prune_from_reachable(); the primary
 addition is that this function automatically gathers
@@ -1276,11 +1314,11 @@ or 
 
    ostree_sysroot_get_repo ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_get_repo (OstreeSysroot *self,
                          OstreeRepo **out_repo,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);
    
 
    Retrieve the OSTree repository in sysroot self
 . The repo is guaranteed to be open
 (see ostree_repo_open()).
    
@@ -1319,7 +1357,7 @@ ostree_sysroot_get_repo (
 
    Returns
    
-
     TRUE on success, FALSE otherwise
    
+
     TRUE on success, FALSE otherwise
    
 
    
 
    
 
    
@@ -1344,7 +1382,7 @@ ostree_sysroot_get_staged_deployment (
 
    Returns
    
-
    The currently staged deployment, or NULL if none. 
    
+
    The currently staged deployment, or NULL if none. 
    
 
    [transfer none][nullable]
    
 
    
 
    Since: 2018.5
    
@@ -1352,11 +1390,11 @@ ostree_sysroot_get_staged_deployment (
 
    ostree_sysroot_init_osname ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_init_osname (OstreeSysroot *self,
                             const char *osname,
-                            GCancellable *cancellable,
-                            GError **error);
    
+                            GCancellable *cancellable,
+                            GError **error);
    
 
    Initialize the directory structure for an "osname", which is a
 group of operating system deployments, with a shared /var.  One
 is required for generating a deployment.
    
@@ -1397,12 +1435,12 @@ is required for generating a deployment.
    
 
    
 
    
 
    ostree_sysroot_deployment_set_kargs ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_deployment_set_kargs (OstreeSysroot *self,
                                      OstreeDeployment *deployment,
                                      char **new_kargs,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     GCancellable *cancellable,
+                                     GError **error);
    
 
    Entirely replace the kernel arguments of deployment
  with the
 values in new_kargs
@@ -1448,12 +1486,12 @@ values in new_kargs
 
    
 
    
 
    ostree_sysroot_deployment_set_mutable ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_deployment_set_mutable (OstreeSysroot *self,
                                        OstreeDeployment *deployment,
-                                       gboolean is_mutable,
-                                       GCancellable *cancellable,
-                                       GError **error);
    
+                                       gboolean is_mutable,
+                                       GCancellable *cancellable,
+                                       GError **error);
    
 
    By default, deployment directories are not mutable.  This function
 will allow making them temporarily mutable, for example to allow
 layering additional non-OSTree content.
    
@@ -1498,12 +1536,12 @@ layering additional non-OSTree content.
    
 
    
 
    
 
    ostree_sysroot_deployment_unlock ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_deployment_unlock (OstreeSysroot *self,
                                   OstreeDeployment *deployment,
                                   OstreeDeploymentUnlockedState unlocked_state,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  GCancellable *cancellable,
+                                  GError **error);
    
 
    Configure the target deployment deployment
  such that it
 is writable.  There are multiple modes, essentially differing
@@ -1552,11 +1590,11 @@ across reboots.
    
 
    
 
    
 
    ostree_sysroot_deployment_set_pinned ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_deployment_set_pinned (OstreeSysroot *self,
                                       OstreeDeployment *deployment,
-                                      gboolean is_pinned,
-                                      GError **error);
    
+                                      gboolean is_pinned,
+                                      GError **error);
    
 
    By default, deployments may be subject to garbage collection. Typical uses of
 libostree only retain at most 2 deployments. If is_pinned
  is TRUE, a
@@ -1603,11 +1641,11 @@ the staged deployment (as it's not in the bootloader entries).
    
 
    
 
    
 
    ostree_sysroot_write_deployments ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_write_deployments (OstreeSysroot *self,
-                                  GPtrArray *new_deployments,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  GPtrArray *new_deployments,
+                                  GCancellable *cancellable,
+                                  GError **error);
    
 
    Older version of ostree_sysroot_write_deployments_with_options(). This
 version will perform post-deployment cleanup by default.
    
 
    
@@ -1646,13 +1684,13 @@ version will perform post-deployment cleanup by default.
    
 
    
 
    
 
    ostree_sysroot_write_deployments_with_options ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_write_deployments_with_options
                                (OstreeSysroot *self,
-                                GPtrArray *new_deployments,
+                                GPtrArray *new_deployments,
                                 OstreeSysrootWriteDeploymentsOpts *opts,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Assuming new_deployments
  have already been deployed in place on disk via
 ostree_sysroot_deploy_tree(), atomically update bootloader configuration. By
@@ -1703,17 +1741,17 @@ if for example you want to control pruning of the repository.
    
 
    
 
    
 
    ostree_sysroot_write_origin_file ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_write_origin_file (OstreeSysroot *sysroot,
                                   OstreeDeployment *deployment,
-                                  GKeyFile *new_origin,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  GKeyFile *new_origin,
+                                  GCancellable *cancellable,
+                                  GError **error);
    
 
    Immediately replace the origin file of the referenced deployment
 
 with the contents of new_origin
 .  If new_origin
- is NULL,
+ is NULL,
 this function will write the current origin of deployment
 .
    
 
    
@@ -1757,16 +1795,16 @@ this function will write the current origin of deplo
 
    
 
    
 
    ostree_sysroot_stage_tree ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_stage_tree (OstreeSysroot *self,
                            const char *osname,
                            const char *revision,
-                           GKeyFile *origin,
+                           GKeyFile *origin,
                            OstreeDeployment *merge_deployment,
                            char **override_kernel_argv,
                            OstreeDeployment **out_new_deployment,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);
    
 
    Older version of ostree_sysroot_stage_tree_with_options().
    
 
    
 
    Parameters
    
@@ -1804,7 +1842,7 @@ ostree_sysroot_stage_tree (
    override_kernel_argv
    
-
    
+
@@ -1830,17 +1868,17 @@ ostree_sysroot_stage_tree (
 
    ostree_sysroot_stage_tree_with_options ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_stage_tree_with_options
                                (OstreeSysroot *self,
                                 const char *osname,
                                 const char *revision,
-                                GKeyFile *origin,
+                                GKeyFile *origin,
                                 OstreeDeployment *merge_deployment,
                                 OstreeSysrootDeployTreeOpts *opts,
                                 OstreeDeployment **out_new_deployment,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Like ostree_sysroot_deploy_tree(), but "finalization" only occurs at OS
 shutdown time.
    
 
    
@@ -1905,12 +1943,12 @@ shutdown time.
    
 
    
 
    
 
    ostree_sysroot_stage_overlay_initrd ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_stage_overlay_initrd (OstreeSysroot *self,
                                      int fd,
                                      char **out_checksum,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     GCancellable *cancellable,
+                                     GError **error);
    
 
    Stage an overlay initrd to be used in an upcoming deployment. Returns a checksum which
 can be passed to ostree_sysroot_deploy_tree_with_options() or
 ostree_sysroot_stage_tree_with_options() via the overlay_initrds array option.
    
@@ -1956,16 +1994,16 @@ can be passed to 
 
    ostree_sysroot_deploy_tree ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_deploy_tree (OstreeSysroot *self,
                             const char *osname,
                             const char *revision,
-                            GKeyFile *origin,
+                            GKeyFile *origin,
                             OstreeDeployment *provided_merge_deployment,
                             char **override_kernel_argv,
                             OstreeDeployment **out_new_deployment,
-                            GCancellable *cancellable,
-                            GError **error);
    
+                            GCancellable *cancellable,
+                            GError **error);
    
 
    Older version of ostree_sysroot_stage_tree_with_options().
    
 
    
 
    Parameters
    
@@ -2003,7 +2041,7 @@ ostree_sysroot_deploy_tree (
    override_kernel_argv
    
-
    
+
@@ -2029,17 +2067,17 @@ ostree_sysroot_deploy_tree (
 
    ostree_sysroot_deploy_tree_with_options ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_deploy_tree_with_options
                                (OstreeSysroot *self,
                                 const char *osname,
                                 const char *revision,
-                                GKeyFile *origin,
+                                GKeyFile *origin,
                                 OstreeDeployment *provided_merge_deployment,
                                 OstreeSysrootDeployTreeOpts *opts,
                                 OstreeDeployment **out_new_deployment,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Check out deployment tree with revision revision
 , performing a 3
 way merge with provided_merge_deployment
@@ -2150,7 +2188,7 @@ ostree_sysroot_query_deployments_for (OstreeDeployment **out_pending,
                                       OstreeDeployment **out_rollback);
 
    Find the pending and rollback deployments for osname
-. Pass NULL for osname
+. Pass NULL for osname
 
 to use the booted deployment's osname. By default, pending deployment is the
 first deployment in the order that matches osname
@@ -2195,7 +2233,7 @@ we're not looking at the booted deployment.
    
 
    
 
    
 
    ostree_sysroot_origin_new_from_refspec ()
    
-
    GKeyFile *
+
    GKeyFile *
 ostree_sysroot_origin_new_from_refspec
                                (OstreeSysroot *self,
                                 const char *refspec);
    
@@ -2231,15 +2269,15 @@ as an origin. 
    
 
    
 
    
 
    ostree_sysroot_simple_write_deployment ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_simple_write_deployment
                                (OstreeSysroot *sysroot,
                                 const char *osname,
                                 OstreeDeployment *new_deployment,
                                 OstreeDeployment *merge_deployment,
                                 OstreeSysrootSimpleWriteDeploymentFlags flags,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Prepend new_deployment
  to the list of deployments, commit, and
 cleanup.  By default, all other deployments for the given osname
@@ -2364,6 +2402,6 @@ later, instead.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-SELinux-policy-management.html b/apidoc/html/ostree-SELinux-policy-management.html
index ec9674db..a56e1f7d 100644
--- a/apidoc/html/ostree-SELinux-policy-management.html
+++ b/apidoc/html/ostree-SELinux-policy-management.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
    
 
    Use these as kernel arguments; if NULL, inherit options from provided_merge_deployment. 
    Use these as kernel arguments; if NULL, inherit options from provided_merge_deployment. 
    		
 [allow-none][array zero-terminated=1][element-type utf8]
 
    
 
    Use these as kernel arguments; if NULL, inherit options from provided_merge_deployment. 
    Use these as kernel arguments; if NULL, inherit options from provided_merge_deployment. 
    		
 [allow-none][array zero-terminated=1][element-type utf8]
 
    
 
    
 
    
 
-GFile *
+GFile *
 
 
 ostree_sepolicy_get_path ()
@@ -72,7 +72,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sepolicy_get_label ()
@@ -87,7 +87,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sepolicy_restorecon ()
@@ -95,7 +95,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sepolicy_setfscreatecon ()
@@ -141,9 +141,9 @@ root and perform labeling.
    
 
    
 
    ostree_sepolicy_new ()
    
 
    OstreeSePolicy *
-ostree_sepolicy_new (GFile *path,
-                     GCancellable *cancellable,
-                     GError **error);
    
+ostree_sepolicy_new (GFile *path,
+                     GCancellable *cancellable,
+                     GError **error);
 
    
 
    Parameters
    
 
    
@@ -183,8 +183,8 @@ ostree_sepolicy_new (
    ostree_sepolicy_new_at ()
    
 
    OstreeSePolicy *
 ostree_sepolicy_new_at (int rootfs_dfd,
-                        GCancellable *cancellable,
-                        GError **error);
    
+                        GCancellable *cancellable,
+                        GError **error);
 
    
 
    Parameters
    
 
    
@@ -223,7 +223,7 @@ ostree_sepolicy_new_at (int
 
    
 
    ostree_sepolicy_get_path ()
    
-
    GFile *
+
    GFile *
 ostree_sepolicy_get_path (OstreeSePolicy *self);
    
 
    
 
    Returns
    
@@ -245,18 +245,18 @@ ostree_sepolicy_get_name (
 
    ostree_sepolicy_get_label ()
    
-
    gboolean
+
    gboolean
 ostree_sepolicy_get_label (OstreeSePolicy *self,
                            const char *relpath,
-                           guint32 unix_mode,
+                           guint32 unix_mode,
                            char **out_label,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);
    
 
    Store in out_label
  the security context for the given relpath
  and
 mode unix_mode
-.  If the policy does not specify a label, NULL
+.  If the policy does not specify a label, NULL
 will be returned.
    
 
    
 
    Parameters
    
@@ -316,15 +316,15 @@ ostree_sepolicy_get_csum (
 
    ostree_sepolicy_restorecon ()
    
-
    gboolean
+
    gboolean
 ostree_sepolicy_restorecon (OstreeSePolicy *self,
                             const char *path,
-                            GFileInfo *info,
-                            GFile *target,
+                            GFileInfo *info,
+                            GFile *target,
                             OstreeSePolicyRestoreconFlags flags,
                             char **out_new_label,
-                            GCancellable *cancellable,
-                            GError **error);
    
+                            GCancellable *cancellable,
+                            GError **error);
    
 
    Reset the security context of target
  based on the SELinux policy.
    
 
    
@@ -363,7 +363,7 @@ ostree_sepolicy_restorecon (
    out_new_label
    
-
    
+
@@ -383,11 +383,11 @@ ostree_sepolicy_restorecon (
 
    ostree_sepolicy_setfscreatecon ()
    
-
    gboolean
+
    gboolean
 ostree_sepolicy_setfscreatecon (OstreeSePolicy *self,
                                 const char *path,
-                                guint32 mode,
-                                GError **error);
    
+                                guint32 mode,
+                                GError **error);
    
 
    
 
    Parameters
    
 
    New label, or NULL if unchanged. 
    New label, or NULL if unchanged. 
    		
 [allow-none][out]
 
    
 
    
@@ -486,6 +486,6 @@ ostree_sepolicy_fscreatecon_cleanup (
-
    Generated by GTK-Doc V1.33.0
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-Signature-management.html b/apidoc/html/ostree-Signature-management.html
index f7973196..39be5e72 100644
--- a/apidoc/html/ostree-Signature-management.html
+++ b/apidoc/html/ostree-Signature-management.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
     
-
-
-
-
+
-
+
@@ -254,13 +254,13 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_commit_verify ()
    
-
    gboolean
+
    gboolean
 ostree_sign_commit_verify (OstreeSign *self,
                            OstreeRepo *repo,
-                           const gchar *commit_checksum,
+                           const gchar *commit_checksum,
                            char **out_success_message,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);
    
 
    Verify if commit is signed with known key.
    
 
    Depending of the signing engine used you will need to load
 the public key(s) for verification with ostree_sign_set_pk,
@@ -296,12 +296,12 @@ the public key(s) for verification with 
    cancellable
    
-
    
+
-
+
@@ -320,12 +320,12 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_data ()
    
-
    gboolean
+
    gboolean
 ostree_sign_data (OstreeSign *self,
-                  GBytes *data,
-                  GBytes **signature,
-                  GCancellable *cancellable,
-                  GError **error);
    
+                  GBytes *data,
+                  GBytes **signature,
+                  GCancellable *cancellable,
+                  GError **error);
    
 
    Sign the given data
  with pre-loaded secret key.
    
 
    Depending of the signing engine used you will need to load
@@ -356,12 +356,12 @@ the secret key with 
    cancellable
    
-
    
+
-
+
@@ -381,12 +381,12 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_data_verify ()
    
-
    gboolean
+
    gboolean
 ostree_sign_data_verify (OstreeSign *self,
-                         GBytes *data,
-                         GVariant *signatures,
+                         GBytes *data,
+                         GVariant *signatures,
                          char **out_success_message,
-                         GError **error);
    
+                         GError **error);
    
 
    Verify given data against signatures with pre-loaded public keys.
    
 
    Depending of the signing engine used you will need to load
 the public key(s) with ostree_sign_set_pk, ostree_sign_add_pk
@@ -422,7 +422,7 @@ or 
 
    
-
+
@@ -443,8 +443,8 @@ will contain the reason).
    
 
    
 
    ostree_sign_get_by_name ()
    
 
    OstreeSign *
-ostree_sign_get_by_name (const gchar *name,
-                         GError **error);
    
+ostree_sign_get_by_name (const gchar *name,
+                         GError **error);
 
    Create a new instance of a signing engine.
    
 
    
 
    Parameters
    
@@ -462,7 +462,7 @@ ostree_sign_get_by_name (const 
    error
    
-
    
+
@@ -470,7 +470,7 @@ ostree_sign_get_by_name (const 
 
    Returns
    
-
    New signing engine, or NULL if the engine is not known. 
    
+
    New signing engine, or NULL if the engine is not known. 
    
 
    [transfer full]
    
 
 
    Since: 2020.2
    
@@ -478,7 +478,7 @@ ostree_sign_get_by_name (const 
 
    ostree_sign_get_name ()
    
-
    const gchar *
+
    const gchar *
 ostree_sign_get_name (OstreeSign *self);
    
 
    Return the pointer to the name of currently used/selected signing engine.
    
 
    
@@ -508,10 +508,10 @@ in case of error (unlikely). 
    
 
    
 
    
 
    ostree_sign_add_pk ()
    
-
    gboolean
+
    gboolean
 ostree_sign_add_pk (OstreeSign *self,
-                    GVariant *public_key,
-                    GError **error);
    
+                    GVariant *public_key,
+                    GError **error);
    
 
    Add the public key for verification. Could be called multiple times for
 adding all needed keys to be used for verification.
    
 
    The public_key
@@ -537,7 +537,7 @@ adding all needed keys to be used for verification.
    
 
 
    
-
+
@@ -556,9 +556,9 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_clear_keys ()
    
-
    gboolean
+
    gboolean
 ostree_sign_clear_keys (OstreeSign *self,
-                        GError **error);
    
+                        GError **error);
    
 
    Clear all previously preloaded secret and public keys.
    
 
    
 
    Parameters
    
@@ -576,7 +576,7 @@ ostree_sign_clear_keys (
    error
    
-
    
+
@@ -593,10 +593,10 @@ in case of error
    
 
    
 
    
 
    ostree_sign_load_pk ()
    
-
    gboolean
+
    gboolean
 ostree_sign_load_pk (OstreeSign *self,
-                     GVariant *options,
-                     GError **error);
    
+                     GVariant *options,
+                     GError **error);
    
 
    Load public keys for verification from anywhere.
 It is expected that all keys would be added to already pre-loaded keys.
    
 
    The options
@@ -633,7 +633,7 @@ directories if defaults are not suitable for any reason.
    
 
 
    
-
+
@@ -652,7 +652,7 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_metadata_format ()
    
-
    const gchar *
+
    const gchar *
 ostree_sign_metadata_format (OstreeSign *self);
    
 
    Return the pointer to the string with format used in (detached) metadata for
 current signing engine.
    
@@ -683,7 +683,7 @@ in case of error (unlikely). 
    
 
    
 
    
 
    ostree_sign_metadata_key ()
    
-
    const gchar *
+
    const gchar *
 ostree_sign_metadata_key (OstreeSign *self);
    
 
    Return the pointer to the name of the key used in (detached) metadata for
 current signing engine.
    
@@ -714,10 +714,10 @@ in case of error (unlikely). 
    
 
    
 
    
 
    ostree_sign_set_pk ()
    
-
    gboolean
+
    gboolean
 ostree_sign_set_pk (OstreeSign *self,
-                    GVariant *public_key,
-                    GError **error);
    
+                    GVariant *public_key,
+                    GError **error);
    
 
    Set the public key for verification. It is expected what all
 previously pre-loaded public keys will be dropped.
    
 
    The public_key
@@ -743,7 +743,7 @@ previously pre-loaded public keys will be dropped.
    
 
 
    
-
+
@@ -762,10 +762,10 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_set_sk ()
    
-
    gboolean
+
    gboolean
 ostree_sign_set_sk (OstreeSign *self,
-                    GVariant *secret_key,
-                    GError **error);
    
+                    GVariant *secret_key,
+                    GError **error);
    
 
    Set the secret key to be used for signing data, commits and summary.
    
 
    The secret_key
  argument depends of the particular engine implementation.
    
@@ -790,7 +790,7 @@ ostree_sign_set_sk (
    error
    
-
    
+
@@ -809,12 +809,12 @@ will contain the reason).
    
 
    
 
    
 
    ostree_sign_summary ()
    
-
    gboolean
+
    gboolean
 ostree_sign_summary (OstreeSign *self,
                      OstreeRepo *repo,
-                     GVariant *keys,
-                     GCancellable *cancellable,
-                     GError **error);
    
+                     GVariant *keys,
+                     GCancellable *cancellable,
+                     GError **error);
    
 
    Add a signature to a summary file.
 Based on ostree_repo_add_gpg_signature_summary implementation.
    
 
    
@@ -843,12 +843,12 @@ Based on ostree_repo_add_gpg_signature_summary implementation.
    
 
 
    
-
+
-
+
@@ -871,6 +871,6 @@ if summary file has been signed with all provided keys
    
 
 
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-Simple-upgrade-class.html b/apidoc/html/ostree-Simple-upgrade-class.html
index 24a5a8f8..8d0846d6 100644
--- a/apidoc/html/ostree-Simple-upgrade-class.html
+++ b/apidoc/html/ostree-Simple-upgrade-class.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -65,7 +65,7 @@
 
 
    
 
    
 
-GPtrArray *
+GPtrArray *
 
 
 ostree_sign_get_all ()
@@ -49,7 +49,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_commit ()
@@ -57,7 +57,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_commit_verify ()
@@ -65,7 +65,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_data ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_data_verify ()
@@ -88,7 +88,7 @@
 
 
    
 
    const gchar *
+const gchar *
 
 
 ostree_sign_get_name ()
@@ -96,7 +96,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_add_pk ()
@@ -104,7 +104,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_clear_keys ()
@@ -112,21 +112,21 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_load_pk ()
 
 
    
 
    const gchar *
+const gchar *
 
 
 ostree_sign_metadata_format ()
 
 
    
 
    const gchar *
+const gchar *
 
 
 ostree_sign_metadata_key ()
@@ -134,7 +134,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_set_pk ()
@@ -142,7 +142,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_set_sk ()
@@ -150,7 +150,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sign_summary ()
@@ -181,7 +181,7 @@ for signing or verifying the commit object or summary file.
    
 
    Functions
    
 
    
 
    ostree_sign_get_all ()
    
-
    GPtrArray *
+
    GPtrArray *
 ostree_sign_get_all (void);
    
 
    Return an array with newly allocated instances of all available
 signing engines; they will not be initialized.
    
@@ -195,12 +195,12 @@ signing engines; they will not be initialized.
    
 
    
 
    
 
    ostree_sign_commit ()
    
-
    gboolean
+
    gboolean
 ostree_sign_commit (OstreeSign *self,
                     OstreeRepo *repo,
-                    const gchar *commit_checksum,
-                    GCancellable *cancellable,
-                    GError **error);
    
+                    const gchar *commit_checksum,
+                    GCancellable *cancellable,
+                    GError **error);
    
 
    Add a signature to a commit.
    
 
    Depending of the signing engine used you will need to load
 the secret key with ostree_sign_set_sk.
    
@@ -230,12 +230,12 @@ the secret key with 
    cancellable
    A GCancellable
    A GCancellable
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    A GCancellable
    A GCancellable
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    A GCancellable
    A GCancellable
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    return location for a GError
    return location for a GError
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    a GError
    a GError
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    a GError
    a GError
    		
  
 
    
 
    
 
    cancellable
    A GCancellable
    A GCancellable
    		
  
 
    
 
    
 
    error
    a GError
    a GError
    		
  
 
    
 
    
 
-GKeyFile *
+GKeyFile *
 
 
 ostree_sysroot_upgrader_get_origin ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-GKeyFile *
+GKeyFile *
 
 
 ostree_sysroot_upgrader_dup_origin ()
@@ -81,7 +81,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sysroot_upgrader_set_origin ()
@@ -97,7 +97,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sysroot_upgrader_check_timestamps ()
@@ -105,7 +105,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sysroot_upgrader_pull ()
@@ -113,7 +113,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sysroot_upgrader_pull_one_dir ()
@@ -121,7 +121,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_sysroot_upgrader_deploy ()
@@ -164,8 +164,8 @@ operations.
    
 
    ostree_sysroot_upgrader_new ()
    
 
    OstreeSysrootUpgrader *
 ostree_sysroot_upgrader_new (OstreeSysroot *sysroot,
-                             GCancellable *cancellable,
-                             GError **error);
    
+                             GCancellable *cancellable,
+                             GError **error);
 
    
 
    Parameters
    
 
    
@@ -205,8 +205,8 @@ ostree_sysroot_upgrader_new (OstreeSysrootUpgrader *
 ostree_sysroot_upgrader_new_for_os (OstreeSysroot *sysroot,
                                     const char *osname,
-                                    GCancellable *cancellable,
-                                    GError **error);
+                                    GCancellable *cancellable,
+                                    GError **error);
 
    
 
    Parameters
    
 
    
@@ -253,8 +253,8 @@ ostree_sysroot_upgrader_new_for_os_with_flags
                                (OstreeSysroot *sysroot,
                                 const char *osname,
                                 OstreeSysrootUpgraderFlags flags,
-                                GCancellable *cancellable,
-                                GError **error);
+                                GCancellable *cancellable,
+                                GError **error);
 
    
 
    Parameters
    
 
    
@@ -301,7 +301,7 @@ ostree_sysroot_upgrader_new_for_os_with_flags
 
    
 
    
 
    ostree_sysroot_upgrader_get_origin ()
    
-
    GKeyFile *
+
    GKeyFile *
 ostree_sysroot_upgrader_get_origin (OstreeSysrootUpgrader *self);
    
 
    
 
    Parameters
    
@@ -320,14 +320,14 @@ ostree_sysroot_upgrader_get_origin (
 
    
 
    Returns
    
-
    The origin file, or NULL if unknown. 
    
+
    The origin file, or NULL if unknown. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    ostree_sysroot_upgrader_dup_origin ()
    
-
    GKeyFile *
+
    GKeyFile *
 ostree_sysroot_upgrader_dup_origin (OstreeSysrootUpgrader *self);
    
 
    
 
    Parameters
    
@@ -346,18 +346,18 @@ ostree_sysroot_upgrader_dup_origin (
 
    
 
    Returns
    
-
    A copy of the origin file, or NULL if unknown. 
    
+
    A copy of the origin file, or NULL if unknown. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    ostree_sysroot_upgrader_set_origin ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_upgrader_set_origin (OstreeSysrootUpgrader *self,
-                                    GKeyFile *origin,
-                                    GCancellable *cancellable,
-                                    GError **error);
    
+                                    GKeyFile *origin,
+                                    GCancellable *cancellable,
+                                    GError **error);
    
 
    Replace the origin with origin
 .
    
 
    
@@ -416,18 +416,18 @@ ostree_sysroot_upgrader_get_origin_description
 
    
 
    
 
    Returns
    
-
     A one-line descriptive summary of the origin, or NULL if unknown
    
+
     A one-line descriptive summary of the origin, or NULL if unknown
    
 
    
 
    
 
    
 
    
 
    ostree_sysroot_upgrader_check_timestamps ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_upgrader_check_timestamps
                                (OstreeRepo *repo,
                                 const char *from_rev,
                                 const char *to_rev,
-                                GError **error);
    
+                                GError **error);
    
 
    Check that the timestamp on to_rev
  is equal to or newer than
 from_rev
@@ -469,21 +469,21 @@ attackers which provide a client with an older commit.
    
 
    
 
    
 
    ostree_sysroot_upgrader_pull ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_upgrader_pull (OstreeSysrootUpgrader *self,
                               OstreeRepoPullFlags flags,
                               OstreeSysrootUpgraderPullFlags upgrader_flags,
                               OstreeAsyncProgress *progress,
-                              gboolean *out_changed,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              gboolean *out_changed,
+                              GCancellable *cancellable,
+                              GError **error);
    
 
    Perform a pull from the origin.  First check if the ref has
 changed, if so download the linked objects, and store the updated
 ref locally.  Then out_changed
- will be TRUE.
    
+ will be TRUE.
    
 
    If the origin remote is unchanged, out_changed
  will be set to
-FALSE.
    
+FALSE.
    
 
    
 
    Parameters
    
 
    
@@ -535,15 +535,15 @@ ref locally.  Then out_changed
 
    
 
    
 
    ostree_sysroot_upgrader_pull_one_dir ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_upgrader_pull_one_dir (OstreeSysrootUpgrader *self,
                                       const char *dir_to_pull,
                                       OstreeRepoPullFlags flags,
                                       OstreeSysrootUpgraderPullFlags upgrader_flags,
                                       OstreeAsyncProgress *progress,
-                                      gboolean *out_changed,
-                                      GCancellable *cancellable,
-                                      GError **error);
    
+                                      gboolean *out_changed,
+                                      GCancellable *cancellable,
+                                      GError **error);
    
 
    Like ostree_sysroot_upgrader_pull(), but allows retrieving just a
 subpath of the tree.  This can be used to download metadata files
 from inside the tree such as package databases.
    
@@ -603,10 +603,10 @@ from inside the tree such as package databases.
    
 
    
 
    
 
    ostree_sysroot_upgrader_deploy ()
    
-
    gboolean
+
    gboolean
 ostree_sysroot_upgrader_deploy (OstreeSysrootUpgrader *self,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Write the new deployment to disk, perform a configuration merge
 with /etc, and update the bootloader configuration.
    
 
    
@@ -710,6 +710,6 @@ with /etc, and update the bootloader configuration.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
    
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-ostree-bootconfig-parser.html b/apidoc/html/ostree-ostree-bootconfig-parser.html
index 70474585..d6c2e2b6 100644
--- a/apidoc/html/ostree-ostree-bootconfig-parser.html
+++ b/apidoc/html/ostree-ostree-bootconfig-parser.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
     
+initrds or NULL to unset. 
    
     
@@ -319,7 +319,7 @@ ostree_bootconfig_parser_get_overlay_initrds
 
 
    
 
    Returns
    
-
    Array of initrds or NULL
+
    Array of initrds or NULL
 if none are set. 
    
 
    [array zero-terminated=1][transfer none][nullable]
    
 
    
@@ -335,6 +335,6 @@ if none are set. 
    
 
 
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-ostree-chain-input-stream.html b/apidoc/html/ostree-ostree-chain-input-stream.html
index 4768ca5c..8f5262a3 100644
--- a/apidoc/html/ostree-ostree-chain-input-stream.html
+++ b/apidoc/html/ostree-ostree-chain-input-stream.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -69,7 +69,7 @@
 
    
 
    ostree_chain_input_stream_new ()
    
 
    OstreeChainInputStream *
-ostree_chain_input_stream_new (GPtrArray *streams);
    
+ostree_chain_input_stream_new (GPtrArray *streams);
 
    
 
 
    
@@ -84,6 +84,6 @@ ostree_chain_input_stream_new (
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-ostree-checksum-input-stream.html b/apidoc/html/ostree-ostree-checksum-input-stream.html
index 154e9330..3623eec8 100644
--- a/apidoc/html/ostree-ostree-checksum-input-stream.html
+++ b/apidoc/html/ostree-ostree-checksum-input-stream.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -69,8 +69,8 @@
 
    
 
    ostree_checksum_input_stream_new ()
    
 
    OstreeChecksumInputStream *
-ostree_checksum_input_stream_new (GInputStream *stream,
-                                  GChecksum *checksum);
    
+ostree_checksum_input_stream_new (GInputStream *stream,
+                                  GChecksum *checksum);
 
    
 
 
    
@@ -85,6 +85,6 @@ ostree_checksum_input_stream_new (
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-ostree-deployment.html b/apidoc/html/ostree-ostree-deployment.html
index 3e3ccde9..1f0ff6f2 100644
--- a/apidoc/html/ostree-ostree-deployment.html
+++ b/apidoc/html/ostree-ostree-deployment.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
    
 
-gboolean
+gboolean
 
 
 ostree_bootconfig_parser_parse ()
@@ -65,7 +65,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_bootconfig_parser_parse_at ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_bootconfig_parser_write ()
@@ -81,7 +81,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_bootconfig_parser_write_at ()
@@ -174,21 +174,21 @@ ostree_bootconfig_parser_clone (
 
    
 
    ostree_bootconfig_parser_parse ()
    
-
    gboolean
+
    gboolean
 ostree_bootconfig_parser_parse (OstreeBootconfigParser *self,
-                                GFile *path,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GFile *path,
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    
 
    
 
    
 
    ostree_bootconfig_parser_parse_at ()
    
-
    gboolean
+
    gboolean
 ostree_bootconfig_parser_parse_at (OstreeBootconfigParser *self,
                                    int dfd,
                                    const char *path,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GCancellable *cancellable,
+                                   GError **error);
    
 
    Initialize a bootconfig from the given file.
    
 
    
 
    Parameters
    
@@ -231,21 +231,21 @@ ostree_bootconfig_parser_parse_at (
 
    
 
    ostree_bootconfig_parser_write ()
    
-
    gboolean
+
    gboolean
 ostree_bootconfig_parser_write (OstreeBootconfigParser *self,
-                                GFile *output,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GFile *output,
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    
 
    
 
    
 
    ostree_bootconfig_parser_write_at ()
    
-
    gboolean
+
    gboolean
 ostree_bootconfig_parser_write_at (OstreeBootconfigParser *self,
                                    int dfd,
                                    const char *path,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GCancellable *cancellable,
+                                   GError **error);
    
 
    
 
    
 
    
@@ -288,7 +288,7 @@ base initrd is part of the primary keys.
    
 
    
 
    initrds
    		
 
    Array of overlay
-initrds or NULL to unset. 
    		[array zero-terminated=1][transfer none][allow-none]
 
    
     
 
    
 
-guint
+guint
 
 
 ostree_deployment_hash ()
@@ -49,7 +49,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_deployment_equal ()
@@ -118,7 +118,7 @@
 
    
 
    
 
-GKeyFile *
+GKeyFile *
 
 
 ostree_deployment_get_origin ()
@@ -142,7 +142,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_deployment_is_pinned ()
@@ -150,7 +150,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_deployment_is_staged ()
@@ -234,8 +234,8 @@
 
    Functions
    
 
    
 
    ostree_deployment_hash ()
    
-
    guint
-ostree_deployment_hash (gconstpointer v);
    
+
    guint
+ostree_deployment_hash (gconstpointer v);
    
 
    
 
    Parameters
    
 
    
@@ -259,9 +259,9 @@ ostree_deployment_hash (
 
    ostree_deployment_equal ()
    
-
    gboolean
-ostree_deployment_equal (gconstpointer ap,
-                         gconstpointer bp);
    
+
    gboolean
+ostree_deployment_equal (gconstpointer ap,
+                         gconstpointer bp);
    
 
    
 
    Parameters
    
 
    
@@ -286,7 +286,7 @@ ostree_deployment_equal (
 
    Returns
    
-
     TRUE if deployments have the same osname, csum, and deployserial
    
+
     TRUE if deployments have the same osname, csum, and deployserial
    
 
 
 
    
@@ -431,7 +431,7 @@ ostree_deployment_get_bootconfig (
 
    
 
    ostree_deployment_get_origin ()
    
-
    GKeyFile *
+
    GKeyFile *
 ostree_deployment_get_origin (OstreeDeployment *self);
    
 
    
 
    Parameters
    
@@ -493,7 +493,7 @@ ostree_deployment_get_unlocked (
 
    
 
    ostree_deployment_is_pinned ()
    
-
    gboolean
+
    gboolean
 ostree_deployment_is_pinned (OstreeDeployment *self);
    
 
    See ostree_sysroot_deployment_set_pinned().
    
 
    
@@ -520,7 +520,7 @@ ostree_deployment_is_pinned (
 
    ostree_deployment_is_staged ()
    
-
    gboolean
+
    gboolean
 ostree_deployment_is_staged (OstreeDeployment *self);
    
 
    
 
    Parameters
    
@@ -638,7 +638,7 @@ ostree_deployment_set_bootconfig (
    ostree_deployment_set_origin ()
    
 
    void
 ostree_deployment_set_origin (OstreeDeployment *self,
-                              GKeyFile *origin);
    
+                              GKeyFile *origin);
    
 
    Replace the "origin", which is a description of the source
 of the deployment and how to update to the next version.
    
 
    
@@ -669,7 +669,7 @@ of the deployment and how to update to the next version.
    
 
    ostree_deployment_origin_remove_transient_state ()
    
 
    void
 ostree_deployment_origin_remove_transient_state
-                               (GKeyFile *origin);
    
+                               (GKeyFile *origin);
    
 
    The intention of an origin file is primarily describe the "inputs" that
 resulted in a deployment, and it's commonly used to derive the new state. For
 example, a key value (in pure libostree mode) is the "refspec". However,
@@ -806,7 +806,7 @@ ostree_deployment_unlocked_state_to_string
 
    
-
+
@@ -816,7 +816,7 @@ ostree_deployment_unlocked_state_to_string
 
-
+
@@ -837,6 +837,6 @@ ostree_deployment_unlocked_state_to_string
 
 
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-ostree-diff.html b/apidoc/html/ostree-ostree-diff.html
index 92cf276c..90015a79 100644
--- a/apidoc/html/ostree-ostree-diff.html
+++ b/apidoc/html/ostree-ostree-diff.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
     
-
+
@@ -192,16 +192,16 @@ sets of 
 
    ostree_diff_dirs_with_options ()
    
-
    gboolean
+
    gboolean
 ostree_diff_dirs_with_options (OstreeDiffFlags flags,
-                               GFile *a,
-                               GFile *b,
-                               GPtrArray *modified,
-                               GPtrArray *removed,
-                               GPtrArray *added,
+                               GFile *a,
+                               GFile *b,
+                               GPtrArray *modified,
+                               GPtrArray *removed,
+                               GPtrArray *added,
                                OstreeDiffDirsOptions *options,
-                               GCancellable *cancellable,
-                               GError **error);
    
+                               GCancellable *cancellable,
+                               GError **error);
    
 
    Compute the difference between directory a
  and b
  as 3 separate
@@ -225,7 +225,7 @@ sets of 
    a
    
-    
+
@@ -272,11 +272,11 @@ sets of 
 
    ostree_diff_print ()
    
 
    void
-ostree_diff_print (GFile *a,
-                   GFile *b,
-                   GPtrArray *modified,
-                   GPtrArray *removed,
-                   GPtrArray *added);
    
+ostree_diff_print (GFile *a,
+                   GFile *b,
+                   GPtrArray *modified,
+                   GPtrArray *removed,
+                   GPtrArray *added);
 
    Print the contents of a diff to stdout.
    
 
    
 
    Parameters
    
@@ -364,6 +364,6 @@ ostree_diff_print (
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree-ostree-repo-file.html b/apidoc/html/ostree-ostree-repo-file.html
index 5dbea044..27fd47ae 100644
--- a/apidoc/html/ostree-ostree-repo-file.html
+++ b/apidoc/html/ostree-ostree-repo-file.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -40,7 +40,7 @@
 
     
 
    
 
    GKeyFile *origin;
    GKeyFile *origin;
    		
 
    How to construct an upgraded version of this tree
    		
  
 
     
 
    
 
    gboolean staged;
    gboolean staged;
    		
 
    TRUE iff this deployment is staged
    		
  
 
    
 
-gboolean
+gboolean
 
 
 ostree_diff_dirs ()
@@ -65,7 +65,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_diff_dirs_with_options ()
@@ -120,15 +120,15 @@ ostree_diff_item_unref (
 
    ostree_diff_dirs ()
    
-
    gboolean
+
    gboolean
 ostree_diff_dirs (OstreeDiffFlags flags,
-                  GFile *a,
-                  GFile *b,
-                  GPtrArray *modified,
-                  GPtrArray *removed,
-                  GPtrArray *added,
-                  GCancellable *cancellable,
-                  GError **error);
    
+                  GFile *a,
+                  GFile *b,
+                  GPtrArray *modified,
+                  GPtrArray *removed,
+                  GPtrArray *added,
+                  GCancellable *cancellable,
+                  GError **error);
    
 
    Compute the difference between directory a
  and b
  as 3 separate
@@ -152,7 +152,7 @@ sets of 
    a
    First directory path, or NULL
    First directory path, or NULL
    		
  
 
    
 
    First directory path, or NULL
    First directory path, or NULL
    		
  
 
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_repo_file_ensure_resolved ()
@@ -48,7 +48,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_repo_file_get_xattrs ()
@@ -94,7 +94,7 @@
 
    
 
    
 
-GVariant *
+GVariant *
 
 
 ostree_repo_file_tree_get_contents ()
@@ -102,7 +102,7 @@
 
    
 
    
 
-GVariant *
+GVariant *
 
 
 ostree_repo_file_tree_get_metadata ()
@@ -125,7 +125,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 ostree_repo_file_tree_query_child ()
@@ -154,18 +154,18 @@
 
    Functions
    
 
    
 
    ostree_repo_file_ensure_resolved ()
    
-
    gboolean
+
    gboolean
 ostree_repo_file_ensure_resolved (OstreeRepoFile *self,
-                                  GError **error);
    
+                                  GError **error);
    
 
    
 
    
 
    
 
    ostree_repo_file_get_xattrs ()
    
-
    gboolean
+
    gboolean
 ostree_repo_file_get_xattrs (OstreeRepoFile *self,
-                             GVariant **out_xattrs,
-                             GCancellable *cancellable,
-                             GError **error);
    
+                             GVariant **out_xattrs,
+                             GCancellable *cancellable,
+                             GError **error);
    
 
    
 
    Parameters
    
 
    
@@ -227,7 +227,7 @@ ostree_repo_file_get_root (void
 ostree_repo_file_tree_set_metadata (OstreeRepoFile *self,
                                     const char *checksum,
-                                    GVariant *metadata);
+                                    GVariant *metadata);
 
 
    
 
    
@@ -246,13 +246,13 @@ ostree_repo_file_tree_get_metadata_checksum
 
    
 
    
 
    ostree_repo_file_tree_get_contents ()
    
-
    GVariant *
+
    GVariant *
 ostree_repo_file_tree_get_contents (OstreeRepoFile *self);
    
 
    
 
    
 
    
 
    ostree_repo_file_tree_get_metadata ()
    
-
    GVariant *
+
    GVariant *
 ostree_repo_file_tree_get_metadata (OstreeRepoFile *self);
    
 
    
 
    
@@ -267,8 +267,8 @@ ostree_repo_file_get_checksum (int
 ostree_repo_file_tree_find_child (OstreeRepoFile *self,
                                   const char *name,
-                                  gboolean *is_dir,
-                                  GVariant **out_container);
+                                  gboolean *is_dir,
+                                  GVariant **out_container);
 
    
 
    Parameters
    
 
    
@@ -305,14 +305,14 @@ ostree_repo_file_tree_find_child (
 
    
 
    ostree_repo_file_tree_query_child ()
    
-
    gboolean
+
    gboolean
 ostree_repo_file_tree_query_child (OstreeRepoFile *self,
                                    int n,
                                    const char *attributes,
-                                   GFileQueryInfoFlags flags,
-                                   GFileInfo **out_info,
-                                   GCancellable *cancellable,
-                                   GError **error);
    
+                                   GFileQueryInfoFlags flags,
+                                   GFileInfo **out_info,
+                                   GCancellable *cancellable,
+                                   GError **error);
    
 
    
 
    Parameters
    
 
    
@@ -357,6 +357,6 @@ ostree_repo_file_tree_query_child (
 
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/ostree.devhelp2 b/apidoc/html/ostree.devhelp2
index c9099046..23f1d5e2 100644
--- a/apidoc/html/ostree.devhelp2
+++ b/apidoc/html/ostree.devhelp2
@@ -69,6 +69,7 @@
     
     
     
+    
     
     
     
@@ -223,7 +224,7 @@
     
     
     
-    
+    
     
     
     
@@ -292,6 +293,7 @@
     
     
     
+    
     
     
     
diff --git a/apidoc/html/reference.html b/apidoc/html/reference.html
index cd01ae0c..052e4007 100644
--- a/apidoc/html/reference.html
+++ b/apidoc/html/reference.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -341,6 +341,10 @@ ostree_collection_ref_new, function in ostree-ref
 
 
    
 
    
+ostree_commit_metadata_for_bootable, function in Core repository-independent functions
+
    
+
    
+
    
 ostree_commit_sizes_entry_copy, function in Core repository-independent functions
 
    
 
    
@@ -1903,6 +1907,10 @@ ostree_repo_transaction_set_collection_ref, function in ostree-misc-experimental
 
 
    
 
    
+ostree_sysroot_require_booted_deployment, function in Root partition mount point
+
    
+
    
+
    
 ostree_sysroot_set_mount_namespace_in_use, function in Root partition mount point
 
    
 
    
@@ -2064,6 +2072,6 @@ OSTREE_YEAR_VERSION, macro in ostree-version
 
 
 
    
-
    Generated by GTK-Doc V1.33.0
    
+
    Generated by GTK-Doc V1.33.1
 
 
\ No newline at end of file
diff --git a/apidoc/html/right-insensitive.png b/apidoc/html/right-insensitive.png
index f64f7685..4c95785b 100644
Binary files a/apidoc/html/right-insensitive.png and b/apidoc/html/right-insensitive.png differ
diff --git a/apidoc/html/right.png b/apidoc/html/right.png
index 136acdc5..76260ec8 100644
Binary files a/apidoc/html/right.png and b/apidoc/html/right.png differ
diff --git a/apidoc/html/up-insensitive.png b/apidoc/html/up-insensitive.png
index c30b38c6..f4049860 100644
Binary files a/apidoc/html/up-insensitive.png and b/apidoc/html/up-insensitive.png differ
diff --git a/apidoc/html/up.png b/apidoc/html/up.png
index 0f4505dc..80b4b37e 100644
Binary files a/apidoc/html/up.png and b/apidoc/html/up.png differ
diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt
index 64bc68d2..e4954c70 100644
--- a/apidoc/ostree-sections.txt
+++ b/apidoc/ostree-sections.txt
@@ -152,6 +152,7 @@ ostree_validate_structureof_dirtree
 ostree_validate_structureof_dirmeta
 ostree_commit_get_parent
 ostree_commit_get_timestamp
+ostree_commit_metadata_for_bootable
 ostree_commit_get_content_checksum
 ostree_commit_get_object_sizes
 OstreeCommitSizesEntry
@@ -532,6 +533,7 @@ ostree_sysroot_get_bootversion
 ostree_sysroot_get_subbootversion
 ostree_sysroot_get_deployments
 ostree_sysroot_get_booted_deployment
+ostree_sysroot_require_booted_deployment
 ostree_sysroot_get_deployment_directory
 ostree_sysroot_get_deployment_dirpath
 ostree_sysroot_get_deployment_origin_path
diff --git a/apidoc/version.xml b/apidoc/version.xml
index 5545e4c3..3ad13fe7 100644
--- a/apidoc/version.xml
+++ b/apidoc/version.xml
@@ -1 +1 @@
-2020.8
\ No newline at end of file
+2021.1
\ No newline at end of file
diff --git a/bash/ostree b/bash/ostree
index d00695ef..d1de8530 100644
--- a/bash/ostree
+++ b/bash/ostree
@@ -321,6 +321,7 @@ _ostree_commit() {
         --canonical-permissions
         --editor -e
         --generate-sizes
+        --bootable
         --link-checkout-speedup
         --no-xattrs
         --orphan
@@ -849,6 +850,7 @@ _ostree_pull_local() {
         --gpg-verify-summary
         --require-static-deltas
         --untrusted
+        --disable-verify-bindings
     "
 
     local options_with_args="
@@ -904,6 +906,7 @@ _ostree_pull() {
         --untrusted
         --bareuseronly-files
         --dry-run
+        --disable-verify-bindings
     "
 
     local options_with_args="
diff --git a/build-aux/config.guess b/build-aux/config.guess
index f50dcdb6..b33c9e89 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-02-24'
+timestamp='2018-08-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD="$driver"
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -138,7 +141,7 @@ Linux|GNU|GNU/*)
 	# We could probably try harder.
 	LIBC=gnu
 
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#include 
 	#if defined(__UCLIBC__)
@@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -237,7 +240,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi}"
+	echo "$machine-${os}${release}${abi-}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -389,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	case `isainfo -b` in
+	    32)
+		echo i386-pc-solaris2"$UNAME_REL"
+		;;
+	    64)
+		echo x86_64-pc-solaris2"$UNAME_REL"
+		;;
+	esac
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -482,7 +480,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include   /* for printf() prototype */
@@ -579,7 +577,7 @@ EOF
 	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include 
 
@@ -660,7 +658,7 @@ EOF
 		    esac
 		fi
 		if [ "$HP_ARCH" = "" ]; then
-		    eval "$set_cc_for_build"
+		    set_cc_for_build
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -700,7 +698,7 @@ EOF
 	esac
 	if [ "$HP_ARCH" = hppa2.0w ]
 	then
-	    eval "$set_cc_for_build"
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -726,7 +724,7 @@ EOF
 	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
     3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include 
 	int
@@ -840,6 +838,17 @@ EOF
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
@@ -894,8 +903,8 @@ EOF
 	# other systems with GNU libc and userland
 	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
 	exit ;;
-    i*86:Minix:*:*)
-	echo "$UNAME_MACHINE"-pc-minix
+    *:Minix:*:*)
+	echo "$UNAME_MACHINE"-unknown-minix
 	exit ;;
     aarch64:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -922,7 +931,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     arm*:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@@ -971,7 +980,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
 	#undef ${UNAME_MACHINE}
@@ -1046,11 +1055,7 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	if objdump -f /bin/sh | grep -q elf32-x86-64; then
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-	else
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	fi
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1289,7 +1294,7 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
@@ -1362,6 +1367,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
+	# shellcheck disable=SC2154
 	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
@@ -1473,7 +1479,7 @@ EOF
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 1d8e98bc..b51fb8cd 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-02-22'
+timestamp='2018-08-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -110,1223 +110,1159 @@ case $# in
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-    if [ "$basic_machine" != "$1" ]
-    then os=`echo "$1" | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <&2
+		exit 1
 		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		os=$field3-$field4
 		;;
-	-bluegene*)
-		os=-cnk
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				os=$field3
+				;;
+		esac
 		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
+	*-*)
+		# A lone config we happen to match not fitting any patern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						os=
+						;;
+					*)
+						basic_machine=$field1
+						os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				os=sysv3
+				;;
+			hp300)
+				basic_machine=m68k-hp
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				os=bsd
+				;;
+			hp300hpux)
+				basic_machine=m68k-hp
+				os=hpux
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				os=mach
+				;;
+			vsta)
+				basic_machine=i386-pc
+				os=vsta
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				os=cxux
+				;;
+			nh[45]000)
+				basic_machine=m88k-harris
+				os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				os=linux
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				os=vms
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				os=unicos
+				;;
+			*)
+				basic_machine=$1
+				os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| wasm32 \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	c54x)
-		basic_machine=tic54x-unknown
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	c55x)
-		basic_machine=tic55x-unknown
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	c6x)
-		basic_machine=tic6x-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
+		;;
+	orion105)
+		cpu=clipper
+		vendor=highlevel
+		;;
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
+		;;
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
+		;;
+
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		cpu=m68000
+		vendor=att
+		;;
+	3b*)
+		cpu=we32k
+		vendor=att
+		;;
+	bluegene*)
+		cpu=powerpc
+		vendor=ibm
+		os=cnk
+		;;
+	decsystem10* | dec10*)
+		cpu=pdp10
+		vendor=dec
+		os=tops10
+		;;
+	decsystem20* | dec20*)
+		cpu=pdp10
+		vendor=dec
+		os=tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		cpu=m68k
+		vendor=motorola
+		;;
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		os=sysv3
+		;;
+	encore | umax | mmax)
+		cpu=ns32k
+		vendor=encore
+		;;
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		os=${os:-bsd}
+		;;
+	fx2800)
+		cpu=i860
+		vendor=alliant
+		;;
+	genix)
+		cpu=ns32k
+		vendor=ns
+		;;
+	h3050r* | hiux*)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		cpu=m68000
+		vendor=hp
+		;;
+	hp9k3[2-9][0-9])
+		cpu=m68k
+		vendor=hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	i*86v32)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv32
+		;;
+	i*86v4*)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv4
+		;;
+	i*86v)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv
+		;;
+	i*86sol2)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=solaris2
+		;;
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		os=${os:-unicos}
+		;;
+	iris | iris4d)
+		cpu=mips
+		vendor=sgi
+		case $os in
+		    irix*)
+			;;
+		    *)
+			os=irix4
+			;;
+		esac
+		;;
+	miniframe)
+		cpu=m68000
+		vendor=convergent
+		;;
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		os=mint
+		;;
+	news-3600 | risc-news)
+		cpu=mips
+		vendor=sony
+		os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $os in
+		    nextstep* )
+			;;
+		    ns2*)
+		      os=nextstep2
+			;;
+		    *)
+		      os=nextstep3
+			;;
+		esac
+		;;
+	np1)
+		cpu=np1
+		vendor=gould
+		;;
+	op50n-* | op60c-*)
+		cpu=hppa1.1
+		vendor=oki
+		os=proelf
+		;;
+	pa-hitachi)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
+		;;
+	pbd)
+		cpu=sparc
+		vendor=tti
+		;;
+	pbb)
+		cpu=m68k
+		vendor=tti
+		;;
+	pc532)
+		cpu=ns32k
+		vendor=pc532
+		;;
+	pn)
+		cpu=pn
+		vendor=gould
+		;;
+	power)
+		cpu=power
+		vendor=ibm
+		;;
+	ps2)
+		cpu=i386
+		vendor=ibm
+		;;
+	rm[46]00)
+		cpu=mips
+		vendor=siemens
+		;;
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
+		;;
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		os=${os:-elf}
+		;;
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		os=vxworks
+		;;
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
+		;;
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
+		;;
+	w65)
+		cpu=w65
+		vendor=wdc
+		;;
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		os=proelf
+		;;
+	none)
+		cpu=none
+		vendor=none
 		;;
 	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
-		;;
-	ms1)
-		basic_machine=mt-unknown
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
 
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
+	*-*)
+		IFS="-" read -r cpu vendor <&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| wasm32-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-pc
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2*)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next)
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
+		cpu=$basic_machine
+		vendor=pc
 		;;
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
 	pc98)
-		basic_machine=i386-pc
+		cpu=i386
+		vendor=pc
 		;;
-	pc98-*)
-		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		os=${os:-unicosmp}
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
+	c90-unknown | c90-cray)
+		vendor=cray
+		os=${os:-unicos}
 		;;
-	pentium4)
-		basic_machine=i786-pc
+	fx80-unknown)
+		vendor=alliant
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	romp-unknown)
+		vendor=ibm
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	mmix-unknown)
+		vendor=knuth
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	pn)
-		basic_machine=pn-gould
+	vax-unknown)
+		vendor=dec
 		;;
-	power)	basic_machine=power-ibm
+	pdp11-unknown)
+		vendor=dec
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+	we32k-unknown)
+		vendor=att
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
+	i370-ibm*)
+		vendor=ibm
 		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	orion-unknown)
+		vendor=highlevel
 		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	x64)
-		basic_machine=x86_64-pc
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
 
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		os=${os:-bosx}
 		;;
-	op50n)
-		basic_machine=hppa1.1-oki
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	blackfin-*)
+		cpu=bfin
+		os=linux
 		;;
-	romp)
-		basic_machine=romp-ibm
+	c54x-*)
+		cpu=tic54x
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	c55x-*)
+		cpu=tic55x
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	c6x-*)
+		cpu=tic6x
 		;;
-	vax)
-		basic_machine=vax-dec
+	e500v[12]-*)
+		cpu=powerpc
+		os=$os"spe"
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	mips3*-*)
+		cpu=mips64
 		;;
-	we32k)
-		basic_machine=we32k-att
+	ms1-*)
+		cpu=mt
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
+	m68knommu-*)
+		cpu=m68k
+		os=linux
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	openrisc-*)
+		cpu=or32
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	parisc-*)
+		cpu=hppa
+		os=linux
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
+	pentium4-*)
+		cpu=i786
+		;;
+	pc98-*)
+		cpu=i386
+		;;
+	ppc-* | ppcbe-*)
+		cpu=powerpc
+		;;
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
+		;;
+	ppc64-*)
+		cpu=powerpc64
+		;;
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
+		;;
+	sb1-*)
+		cpu=mipsisa64sb1
+		;;
+	sb1el-*)
+		cpu=mipsisa64sb1el
+		;;
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+		;;
+	spur-*)
+		cpu=spur
+		;;
+	strongarm-* | thumb-*)
+		cpu=arm
+		;;
+	tx39-*)
+		cpu=mipstx39
+		;;
+	tx39el-*)
+		cpu=mipstx39el
+		;;
+	x64-*)
+		cpu=x86_64
+		;;
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		;;
+
+	# Recognize the cannonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		os=${os:-elf}
+		;;
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
+		;;
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
+		;;
+	crx-*)
+		os=${os:-elf}
+		;;
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
+		;;
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
+		;;
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
+		;;
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
+		;;
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
+		;;
+	s390-*)
+		cpu=s390
+		vendor=ibm
+		;;
+	s390x-*)
+		cpu=s390x
+		vendor=ibm
+		;;
+	tile*-*)
+		os=${os:-linux-gnu}
+		;;
+
 	*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
+		# Recognize the cannonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| arc | arceb \
+			| arm  | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv64 \
+			| rl78 | romp | rs6000 | rx \
+			| score \
+			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| wasm32 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1334,199 +1270,245 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ x"$os" != x"" ]
+if [ x$os != x ]
 then
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-solaris1 | -solaris1.*)
+	bluegene*)
+		os=cnk
+		;;
+	solaris1 | solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
-	-solaris)
-		os=-solaris2
+	solaris)
+		os=solaris2
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	unixware*)
+		os=sysv4.2uw
 		;;
-	-gnu/linux*)
+	gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
-	-es1800*)
-		os=-ose
+	es1800*)
+		os=ose
+		;;
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
+		;;
+	isc)
+		os=isc2.2
+		;;
+	sco6)
+		os=sco5v6
+		;;
+	sco5)
+		os=sco3.2v5
+		;;
+	sco4)
+		os=sco3.2v4
+		;;
+	sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		;;
+	sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	scout)
+		# Don't match below
+		;;
+	sco*)
+		os=sco3.2v2
+		;;
+	psos*)
+		os=psos
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
+	# sysv* is not here because it comes later, after sysvr4.
+	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* | kopensolaris* | plan9* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | knetbsd* | mirbsd* | netbsd* \
+	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
+	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+	     | linux-newlib* | linux-musl* | linux-uclibc* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+	     | morphos* | superux* | rtmk* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
+	qnx*)
+		case $cpu in
+		    x86 | i*86)
 			;;
 		    *)
-			os=-nto$os
+			os=nto-$os
 			;;
 		esac
 		;;
-	-nto-qnx*)
+	hiux*)
+		os=hiuxwe2
 		;;
-	-nto*)
+	nto-qnx*)
+		;;
+	nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	sim | xray | os68k* | v88r* \
+	    | windows* | osx | abug | netware* | os9* \
+	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
 		;;
-	-mac*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
+	linux-dietlibc)
+		os=linux-dietlibc
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
+	linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	-sunos5*)
+	lynx*178)
+		os=lynxos178
+		;;
+	lynx*5)
+		os=lynxos5
+		;;
+	lynx*)
+		os=lynxos
+		;;
+	mac*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
+		;;
+	opened*)
+		os=openedition
+		;;
+	os400*)
+		os=os400
+		;;
+	sunos5*)
 		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-sunos6*)
+	sunos6*)
 		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-opened*)
-		os=-openedition
+	wince*)
+		os=wince
 		;;
-	-os400*)
-		os=-os400
+	utek*)
+		os=bsd
 		;;
-	-wince*)
-		os=-wince
+	dynix*)
+		os=bsd
 		;;
-	-utek*)
-		os=-bsd
+	acis*)
+		os=aos
 		;;
-	-dynix*)
-		os=-bsd
+	atheos*)
+		os=atheos
 		;;
-	-acis*)
-		os=-aos
+	syllable*)
+		os=syllable
 		;;
-	-atheos*)
-		os=-atheos
+	386bsd)
+		os=bsd
 		;;
-	-syllable*)
-		os=-syllable
+	ctix* | uts*)
+		os=sysv
 		;;
-	-386bsd)
-		os=-bsd
+	nova*)
+		os=rtmk-nova
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	ns2)
+		os=nextstep2
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2)
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
+	nsk*)
+		os=nsk
 		;;
 	# Preserve the version number of sinix5.
-	-sinix5.*)
+	sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
-	-sinix*)
-		os=-sysv4
+	sinix*)
+		os=sysv4
 		;;
-	-tpf*)
-		os=-tpf
+	tpf*)
+		os=tpf
 		;;
-	-triton*)
-		os=-sysv3
+	triton*)
+		os=sysv3
 		;;
-	-oss*)
-		os=-sysv3
+	oss*)
+		os=sysv3
 		;;
-	-svr4*)
-		os=-sysv4
+	svr4*)
+		os=sysv4
 		;;
-	-svr3)
-		os=-sysv3
+	svr3)
+		os=sysv3
 		;;
-	-sysvr4)
-		os=-sysv4
+	sysvr4)
+		os=sysv4
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	# This must come after sysvr4.
+	sysv*)
 		;;
-	-ose*)
-		os=-ose
+	ose*)
+		os=ose
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
 		;;
-	-zvmoe)
-		os=-zvmoe
+	zvmoe)
+		os=zvmoe
 		;;
-	-dicos*)
-		os=-dicos
+	dicos*)
+		os=dicos
 		;;
-	-pikeos*)
+	pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $basic_machine in
+		case $cpu in
 		    arm*)
-			os=-eabi
+			os=eabi
 			;;
 		    *)
-			os=-elf
+			os=elf
 			;;
 		esac
 		;;
-	-nacl*)
+	nacl*)
 		;;
-	-ios)
+	ios)
 		;;
-	-none)
+	none)
+		;;
+	*-eabi)
 		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
 		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
@@ -1543,258 +1525,265 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		os=linux
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
 	pru-*)
-		os=-elf
+		os=elf
 		;;
 	*-be)
-		os=-beos
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
 	*-next)
-		os=-nextstep
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
 fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
+case $vendor in
+	unknown)
 		case $os in
-			-riscix*)
+			riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			cnk*|-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			beos*)
 				vendor=be
 				;;
-			-hpux*)
+			hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			luna*)
 				vendor=omron
 				;;
-			-genix*)
+			genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			clix*)
+				vendor=intergraph
+				;;
+			mvs* | opened*)
 				vendor=ibm
 				;;
-			-os400*)
+			os400*)
 				vendor=ibm
 				;;
-			-ptx*)
+			ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			vxsim* | vxworks* | windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			aux*)
 				vendor=apple
 				;;
-			-hms*)
+			hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			mpw* | macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
 				vendor=atari
 				;;
-			-vos*)
+			vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$basic_machine$os"
+echo "$cpu-$vendor-$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index 0cb7f90d..7f3523d3 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-14"
+VERSION=2.4.6
 package_revision=2.4.6
 
 
@@ -387,7 +387,7 @@ EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 # putting '$debug_cmd' at the start of all your functions, you can get
 # bash to show function call trace with:
 #
-#    debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
 debug_cmd=${debug_cmd-":"}
 exit_cmd=:
 
@@ -1370,7 +1370,7 @@ func_lt_ver ()
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2015-10-07.11; # UTC
+scriptversion=2014-01-07.03; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -1530,8 +1530,6 @@ func_run_hooks ()
 {
     $debug_cmd
 
-    _G_rc_run_hooks=false
-
     case " $hookable_fns " in
       *" $1 "*) ;;
       *) func_fatal_error "'$1' does not support hook funcions.n" ;;
@@ -1540,16 +1538,16 @@ func_run_hooks ()
     eval _G_hook_fns=\$$1_hooks; shift
 
     for _G_hook in $_G_hook_fns; do
-      if eval $_G_hook '"$@"'; then
-        # store returned options list back into positional
-        # parameters for next 'cmd' execution.
-        eval _G_hook_result=\$${_G_hook}_result
-        eval set dummy "$_G_hook_result"; shift
-        _G_rc_run_hooks=:
-      fi
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
     done
 
-    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
 }
 
 
@@ -1559,16 +1557,10 @@ func_run_hooks ()
 ## --------------- ##
 
 # In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, you may remove/edit
-# any options that you action, and then pass back the remaining unprocessed
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
 # options in '_result', escaped suitably for
-# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
-# hook's caller know that it should pay attention to
-# '_result'.  Returning $EXIT_FAILURE signalizes that
-# arguments are left untouched by the hook and therefore caller will ignore the
-# result variable.
-#
-# Like this:
+# 'eval'.  Like this:
 #
 #    my_options_prep ()
 #    {
@@ -1578,11 +1570,9 @@ func_run_hooks ()
 #        usage_message=$usage_message'
 #      -s, --silent       don'\''t print informational messages
 #    '
-#        # No change in '$@' (ignored completely by this hook).  There is
-#        # no need to do the equivalent (but slower) action:
-#        # func_quote_for_eval ${1+"$@"}
-#        # my_options_prep_result=$func_quote_for_eval_result
-#        false
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
 #    }
 #    func_add_hook func_options_prep my_options_prep
 #
@@ -1591,37 +1581,25 @@ func_run_hooks ()
 #    {
 #        $debug_cmd
 #
-#        args_changed=false
-#
 #        # Note that for efficiency, we parse as many options as we can
 #        # recognise in a loop before passing the remainder back to the
 #        # caller on the first unrecognised argument we encounter.
 #        while test $# -gt 0; do
 #          opt=$1; shift
 #          case $opt in
-#            --silent|-s) opt_silent=:
-#                         args_changed=:
-#                         ;;
+#            --silent|-s) opt_silent=: ;;
 #            # Separate non-argument short options:
 #            -s*)         func_split_short_opt "$_G_opt"
 #                         set dummy "$func_split_short_opt_name" \
 #                             "-$func_split_short_opt_arg" ${1+"$@"}
 #                         shift
-#                         args_changed=:
 #                         ;;
-#            *)           # Make sure the first unrecognised option "$_G_opt"
-#                         # is added back to "$@", we could need that later
-#                         # if $args_changed is true.
-#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
 #          esac
 #        done
 #
-#        if $args_changed; then
-#          func_quote_for_eval ${1+"$@"}
-#          my_silent_option_result=$func_quote_for_eval_result
-#        fi
-#
-#        $args_changed
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
 #    }
 #    func_add_hook func_parse_options my_silent_option
 #
@@ -1633,32 +1611,16 @@ func_run_hooks ()
 #        $opt_silent && $opt_verbose && func_fatal_help "\
 #    '--silent' and '--verbose' options are mutually exclusive."
 #
-#        false
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
 #    }
 #    func_add_hook func_validate_options my_option_validation
 #
-# You'll also need to manually amend $usage_message to reflect the extra
+# You'll alse need to manually amend $usage_message to reflect the extra
 # options you parse.  It's preferable to append if you can, so that
 # multiple option parsing hooks can be added safely.
 
 
-# func_options_finish [ARG]...
-# ----------------------------
-# Finishing the option parse loop (call 'func_options' hooks ATM).
-func_options_finish ()
-{
-    $debug_cmd
-
-    _G_func_options_finish_exit=false
-    if func_run_hooks func_options ${1+"$@"}; then
-      func_options_finish_result=$func_run_hooks_result
-      _G_func_options_finish_exit=:
-    fi
-
-    $_G_func_options_finish_exit
-}
-
-
 # func_options [ARG]...
 # ---------------------
 # All the functions called inside func_options are hookable. See the
@@ -1668,28 +1630,17 @@ func_options ()
 {
     $debug_cmd
 
-    _G_rc_options=false
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
 
-    for my_func in options_prep parse_options validate_options options_finish
-    do
-      if eval func_$my_func '${1+"$@"}'; then
-        eval _G_res_var='$'"func_${my_func}_result"
-        eval set dummy "$_G_res_var" ; shift
-        _G_rc_options=:
-      fi
-    done
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
 
-    # Save modified positional parameters for caller.  As a top-level
-    # options-parser function we always need to set the 'func_options_result'
-    # variable (regardless the $_G_rc_options value).
-    if $_G_rc_options; then
-      func_options_result=$_G_res_var
-    else
-      func_quote_for_eval ${1+"$@"}
-      func_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_options
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
 }
 
 
@@ -1698,9 +1649,9 @@ func_options ()
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
-# needs to propagate that back to rest of this script, then the complete
+# needs to propogate that back to rest of this script, then the complete
 # modified list must be put in 'func_run_hooks_result' before
-# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
+# returning.
 func_hookable func_options_prep
 func_options_prep ()
 {
@@ -1710,14 +1661,10 @@ func_options_prep ()
     opt_verbose=false
     opt_warning_types=
 
-    _G_rc_options_prep=false
-    if func_run_hooks func_options_prep ${1+"$@"}; then
-      _G_rc_options_prep=:
-      # save modified positional parameters for caller
-      func_options_prep_result=$func_run_hooks_result
-    fi
+    func_run_hooks func_options_prep ${1+"$@"}
 
-    $_G_rc_options_prep
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
 }
 
 
@@ -1731,20 +1678,18 @@ func_parse_options ()
 
     func_parse_options_result=
 
-    _G_rc_parse_options=false
     # this just eases exit handling
     while test $# -gt 0; do
       # Defer to hook functions for initial option parsing, so they
       # get priority in the event of reusing an option name.
-      if func_run_hooks func_parse_options ${1+"$@"}; then
-        eval set dummy "$func_run_hooks_result"; shift
-        _G_rc_parse_options=:
-      fi
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
 
       # Break out of the loop if we already parsed every option.
       test $# -gt 0 || break
 
-      _G_match_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
@@ -1759,10 +1704,7 @@ func_parse_options ()
 		      ;;
 
         --warnings|--warning|-W)
-                      if test $# = 0 && func_missing_arg $_G_opt; then
-                        _G_rc_parse_options=:
-                        break
-                      fi
+                      test $# = 0 && func_missing_arg $_G_opt && break
                       case " $warning_categories $1" in
                         *" $1 "*)
                           # trailing space prevents matching last $1 above
@@ -1815,25 +1757,15 @@ func_parse_options ()
                       shift
                       ;;
 
-        --)           _G_rc_parse_options=: ; break ;;
+        --)           break ;;
         -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift
-                      _G_match_parse_options=false
-                      break
-                      ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
       esac
-
-      $_G_match_parse_options && _G_rc_parse_options=:
     done
 
-
-    if $_G_rc_parse_options; then
-      # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      func_parse_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_parse_options
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
 }
 
 
@@ -1846,21 +1778,16 @@ func_validate_options ()
 {
     $debug_cmd
 
-    _G_rc_validate_options=false
-
     # Display all warnings if -W was not given.
     test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
-    if func_run_hooks func_validate_options ${1+"$@"}; then
-      # save modified positional parameters for caller
-      func_validate_options_result=$func_run_hooks_result
-      _G_rc_validate_options=:
-    fi
+    func_run_hooks func_validate_options ${1+"$@"}
 
     # Bail if the options were screwed!
     $exit_cmd $EXIT_FAILURE
 
-    $_G_rc_validate_options
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
 }
 
 
@@ -2141,12 +2068,12 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-14
+       version:        $progname (GNU libtool) 2.4.6
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
 Report bugs to .
-GNU libtool home page: .
+GNU libtool home page: .
 General help using GNU software: ."
     exit 0
 }
@@ -2197,7 +2124,7 @@ fi
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func__fatal_error ${1+"$@"} \
+    func_fatal_error ${1+"$@"} \
       "See the $PACKAGE documentation for more information." \
       "Fatal configuration error."
 }
@@ -2343,8 +2270,6 @@ libtool_options_prep ()
     nonopt=
     preserve_args=
 
-    _G_rc_lt_options_prep=:
-
     # Shorthand for --mode=foo, only valid as the first argument
     case $1 in
     clean|clea|cle|cl)
@@ -2368,18 +2293,11 @@ libtool_options_prep ()
     uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
       shift; set dummy --mode uninstall ${1+"$@"}; shift
       ;;
-    *)
-      _G_rc_lt_options_prep=false
-      ;;
     esac
 
-    if $_G_rc_lt_options_prep; then
-      # Pass back the list of options.
-      func_quote_for_eval ${1+"$@"}
-      libtool_options_prep_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_lt_options_prep
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
 }
 func_add_hook func_options_prep libtool_options_prep
 
@@ -2391,12 +2309,9 @@ libtool_parse_options ()
 {
     $debug_cmd
 
-    _G_rc_lt_parse_options=false
-
     # Perform our own loop to consume as many options as possible in
     # each iteration.
     while test $# -gt 0; do
-      _G_match_lt_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
@@ -2471,22 +2386,15 @@ libtool_parse_options ()
                         func_append preserve_args " $_G_opt"
                         ;;
 
-        # An option not handled by this hook function:
-        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
-                        _G_match_lt_parse_options=false
-                        break
-                        ;;
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
       esac
-      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
     done
 
-    if $_G_rc_lt_parse_options; then
-      # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      libtool_parse_options_result=$func_quote_for_eval_result
-    fi
 
-    $_G_rc_lt_parse_options
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
 }
 func_add_hook func_parse_options libtool_parse_options
 
@@ -7366,14 +7274,10 @@ func_mode_link ()
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       # -specs=*             GCC specs files
       # -stdlib=*            select c++ std lib with clang
-      # -fsanitize=*         Clang/GCC memory and address sanitizer
-      # -fuse-ld=*           Linker select flags for GCC
-      # -static-*            direct GCC to link specific libraries statically
-      # -fcilkplus           Cilk Plus language extension features for C/C++
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
+      -specs=*)
         func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
@@ -7666,10 +7570,7 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs=$dlfiles ;;
 	dlpreopen) libs=$dlprefiles ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -7988,19 +7889,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
 	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
 	    func_fatal_error "'$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -8924,9 +8825,6 @@ func_mode_link ()
 	    revision=$number_minor
 	    lt_irix_increment=no
 	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
-	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/buildutil/libtool.m4 b/buildutil/libtool.m4
index a6d21ae5..a644432f 100644
--- a/buildutil/libtool.m4
+++ b/buildutil/libtool.m4
@@ -728,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -1041,8 +1042,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
       echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
       cat > conftest.c << _LT_EOF
@@ -1492,7 +1493,7 @@ need_locks=$enable_libtool_lock
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
-: ${AR_FLAGS=cr}
+: ${AR_FLAGS=cru}
 _LT_DECL([], [AR], [1], [The archiver])
 _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
 
@@ -2866,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -2874,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2886,18 +2890,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3557,7 +3549,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4063,8 +4055,7 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -4436,7 +4427,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4704,12 +4695,6 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
-      # flang / f18. f95 an alias for gfortran or flang on Debian
-      flang* | f18* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
@@ -4954,9 +4939,6 @@ m4_if([$1], [CXX], [
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -5019,9 +5001,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5276,7 +5255,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5797,7 +5776,6 @@ _LT_EOF
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5819,7 +5797,7 @@ _LT_EOF
       esac
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -6445,7 +6423,7 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -6820,7 +6798,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -6885,7 +6863,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test yes = "$GXX"; then
@@ -7224,7 +7202,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -7308,7 +7286,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@@ -7319,7 +7297,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
diff --git a/config.h.in b/config.h.in
index 44d3a44c..1957881f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,6 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if we are building with -fsanitize=address */
+/* Define if we are building with asan and ubsan */
 #undef BUILDOPT_ASAN
 
 /* Define if we are enabling ostree trivial-httpd entrypoint */
@@ -193,6 +193,9 @@
 #endif
 
 
+/* Define if we have a GRUB version newer than 2.02 */
+#undef WITH_MODERN_GRUB
+
 /* Define if we have smack.pc */
 #undef WITH_SMACK
 
diff --git a/configure b/configure
index 0d4458b3..5602ec3d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libostree 2020.8.
+# Generated by GNU Autoconf 2.69 for libostree 2021.1.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libostree'
 PACKAGE_TARNAME='libostree'
-PACKAGE_VERSION='2020.8'
-PACKAGE_STRING='libostree 2020.8'
+PACKAGE_VERSION='2021.1'
+PACKAGE_STRING='libostree 2021.1'
 PACKAGE_BUGREPORT='walters@verbum.org'
 PACKAGE_URL=''
 
@@ -690,13 +690,6 @@ USE_LIBARCHIVE_FALSE
 USE_LIBARCHIVE_TRUE
 OT_DEP_LIBARCHIVE_LIBS
 OT_DEP_LIBARCHIVE_CFLAGS
-ENABLE_RUST_FALSE
-ENABLE_RUST_TRUE
-RUST_DEBUG_FALSE
-RUST_DEBUG_TRUE
-RUST_TARGET_SUBDIR
-rustc
-cargo
 ENABLE_MAN_FALSE
 ENABLE_MAN_TRUE
 XSLTPROC
@@ -891,7 +884,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -919,6 +911,7 @@ enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_largefile
+enable_sanitizers
 enable_static
 enable_shared
 with_pic
@@ -946,8 +939,6 @@ enable_gtk_doc
 enable_gtk_doc_html
 enable_gtk_doc_pdf
 enable_man
-enable_rust
-enable_rust_debug
 with_libarchive
 with_selinux
 with_smack
@@ -961,6 +952,7 @@ with_mkinitcpio
 with_libsystemd
 with_systemdsystemunitdir
 with_systemdsystemgeneratordir
+with_modern_grub
 with_builtin_grub2_mkconfig
 with_grub2_mkconfig_path
 with_static_compiler
@@ -1060,7 +1052,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1313,15 +1304,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1459,7 +1441,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1572,7 +1554,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libostree 2020.8 to adapt to many kinds of systems.
+\`configure' configures libostree 2021.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1612,7 +1594,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1643,7 +1624,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libostree 2020.8:";;
+     short | recursive ) echo "Configuration of libostree 2021.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,6 +1642,7 @@ Optional Features:
   --disable-dependency-tracking
                           speeds up one-time build
   --disable-largefile     omit support for large files
+  --enable-sanitizers     Enable ASAN and UBSAN (default: no)
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1688,9 +1670,6 @@ Optional Features:
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
   --enable-man            generate man pages [default=auto]
-  --enable-rust           Compile Rust code instead of C [default=no]
-  --enable-rust-debug     Build Rust code with debugging information
-                          [default=no]
   --enable-rofiles-fuse   generate rofiles-fuse helper [default=yes]
   --enable-experimental-api
                           Enable unstable experimental API in libostree
@@ -1729,6 +1708,8 @@ Optional Packages:
                           Directory for systemd service files
   --with-systemdsystemgeneratordir=DIR
                           Directory for systemd generators
+  --with-modern-grub      Omit grub linux and initrd suffixes for EFI/BIOS
+                          booting on GRUB >2.02 (default: no)
   --with-builtin-grub2-mkconfig
                           Use a builtin minimal grub2-mkconfig to generate a
                           GRUB2 configuration file (default: no)
@@ -1908,7 +1889,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libostree configure 2020.8
+libostree configure 2021.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2380,7 +2361,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libostree $as_me 2020.8, which was
+It was created by libostree $as_me 2021.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3248,7 +3229,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libostree'
- VERSION='2020.8'
+ VERSION='2021.1'
 
 
 # Some tools Automake needs.
@@ -5033,7 +5014,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5079,7 +5060,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5103,7 +5084,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5148,7 +5129,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5172,7 +5153,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5980,11 +5961,11 @@ done
 test -n "$YACC" || YACC="yacc"
 
 
-YEAR_VERSION=2020
+YEAR_VERSION=2021
 
-RELEASE_VERSION=8
+RELEASE_VERSION=1
 
-PACKAGE_VERSION=2020.8
+PACKAGE_VERSION=2021.1
 
 
 if echo "$CFLAGS" | grep -q -E -e '-Werror($| )'; then :
@@ -6049,17 +6030,14 @@ fi
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=address in CFLAGS" >&5
-$as_echo_n "checking for -fsanitize=address in CFLAGS... " >&6; }
-if echo $CFLAGS | grep -q -e -fsanitize=address; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  using_asan=yes
+# Check whether --enable-sanitizers was given.
+if test "${enable_sanitizers+set}" = set; then :
+  enableval=$enable_sanitizers;
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  enable_sanitizers=no
 fi
- if test x$using_asan = xyes; then
+
+ if test x$enable_sanitizers != xno; then
   BUILDOPT_ASAN_TRUE=
   BUILDOPT_ASAN_FALSE='#'
 else
@@ -6069,8 +6047,13 @@ fi
 
 if test -z "$BUILDOPT_ASAN_TRUE"; then :
 
+  sanitizer_flags="-fsanitize=address -fsanitize=undefined -fsanitize-undefined-trap-on-error"
+  CFLAGS="$CFLAGS ${sanitizer_flags}"
+  CXXFLAGS="$CXXFLAGS ${sanitizer_flags}"
+
 $as_echo "#define BUILDOPT_ASAN 1" >>confdefs.h
 
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=thread in CFLAGS" >&5
@@ -7278,7 +7261,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -7640,7 +7623,7 @@ esac
 fi
 
 : ${AR=ar}
-: ${AR_FLAGS=cr}
+: ${AR_FLAGS=cru}
 
 
 
@@ -8141,8 +8124,11 @@ _LT_EOF
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -9361,8 +9347,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cr libconftest.a conftest.o" >&5
-      $AR cr libconftest.a conftest.o 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
@@ -10223,12 +10209,6 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
-      # flang / f18. f95 an alias for gfortran or flang on Debian
-      flang* | f18* | f95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
@@ -10705,9 +10685,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
   esac
 
   ld_shlibs=yes
@@ -10962,7 +10939,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -11632,7 +11609,6 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
-	link_all_deplibs=no
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -11654,7 +11630,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -12749,6 +12725,9 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -12757,7 +12736,7 @@ fi
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12769,18 +12748,6 @@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -14384,8 +14351,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $pkg_config_args" >&5
-$as_echo_n "checking for $pkg_config_args... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
 
 if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
@@ -14425,7 +14392,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14443,7 +14410,7 @@ fi
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	:
 else
@@ -14732,8 +14699,8 @@ rm -f core conftest.err conftest.$ac_objext \
 GIO_DEPENDENCY="gio-unix-2.0 >= 2.40.0"
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GIO_DEPENDENCY" >&5
-$as_echo_n "checking for $GIO_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_GIO_UNIX" >&5
+$as_echo_n "checking for OT_DEP_GIO_UNIX... " >&6; }
 
 if test -n "$OT_DEP_GIO_UNIX_CFLAGS"; then
     pkg_cv_OT_DEP_GIO_UNIX_CFLAGS="$OT_DEP_GIO_UNIX_CFLAGS"
@@ -14773,7 +14740,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14800,7 +14767,7 @@ Alternatively, you may set the environment variables OT_DEP_GIO_UNIX_CFLAGS
 and OT_DEP_GIO_UNIX_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -14824,8 +14791,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblzma >= 5.0.5" >&5
-$as_echo_n "checking for liblzma >= 5.0.5... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_LZMA" >&5
+$as_echo_n "checking for OT_DEP_LZMA... " >&6; }
 
 if test -n "$OT_DEP_LZMA_CFLAGS"; then
     pkg_cv_OT_DEP_LZMA_CFLAGS="$OT_DEP_LZMA_CFLAGS"
@@ -14865,7 +14832,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14892,7 +14859,7 @@ Alternatively, you may set the environment variables OT_DEP_LZMA_CFLAGS
 and OT_DEP_LZMA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -14916,8 +14883,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-$as_echo_n "checking for zlib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_ZLIB" >&5
+$as_echo_n "checking for OT_DEP_ZLIB... " >&6; }
 
 if test -n "$OT_DEP_ZLIB_CFLAGS"; then
     pkg_cv_OT_DEP_ZLIB_CFLAGS="$OT_DEP_ZLIB_CFLAGS"
@@ -14957,7 +14924,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14984,7 +14951,7 @@ Alternatively, you may set the environment variables OT_DEP_ZLIB_CFLAGS
 and OT_DEP_ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -15008,8 +14975,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for e2p" >&5
-$as_echo_n "checking for e2p... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_E2P" >&5
+$as_echo_n "checking for OT_DEP_E2P... " >&6; }
 
 if test -n "$OT_DEP_E2P_CFLAGS"; then
     pkg_cv_OT_DEP_E2P_CFLAGS="$OT_DEP_E2P_CFLAGS"
@@ -15049,7 +15016,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15076,7 +15043,7 @@ Alternatively, you may set the environment variables OT_DEP_E2P_CFLAGS
 and OT_DEP_E2P_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -15111,8 +15078,8 @@ if test x$with_curl != xno ; then :
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= $CURL_DEPENDENCY" >&5
-$as_echo_n "checking for libcurl >= $CURL_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_CURL" >&5
+$as_echo_n "checking for OT_DEP_CURL... " >&6; }
 
 if test -n "$OT_DEP_CURL_CFLAGS"; then
     pkg_cv_OT_DEP_CURL_CFLAGS="$OT_DEP_CURL_CFLAGS"
@@ -15152,7 +15119,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15179,7 +15146,7 @@ Alternatively, you may set the environment variables OT_DEP_CURL_CFLAGS
 and OT_DEP_CURL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -15278,8 +15245,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SOUP_DEPENDENCY" >&5
-$as_echo_n "checking for $SOUP_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_SOUP" >&5
+$as_echo_n "checking for OT_DEP_SOUP... " >&6; }
 
 if test -n "$OT_DEP_SOUP_CFLAGS"; then
     pkg_cv_OT_DEP_SOUP_CFLAGS="$OT_DEP_SOUP_CFLAGS"
@@ -15319,7 +15286,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15346,7 +15313,7 @@ Alternatively, you may set the environment variables OT_DEP_SOUP_CFLAGS
 and OT_DEP_SOUP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -15730,8 +15697,8 @@ if test x$with_gpgme != xno; then :
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpgme-pthread >= $LIBGPGME_DEPENDENCY" >&5
-$as_echo_n "checking for gpgme-pthread >= $LIBGPGME_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_GPGME" >&5
+$as_echo_n "checking for OT_DEP_GPGME... " >&6; }
 
 if test -n "$OT_DEP_GPGME_CFLAGS"; then
     pkg_cv_OT_DEP_GPGME_CFLAGS="$OT_DEP_GPGME_CFLAGS"
@@ -15771,7 +15738,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15885,7 +15852,7 @@ $as_echo "no" >&6; }
 
 
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 
@@ -15999,8 +15966,8 @@ fi
     OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpg-error" >&5
-$as_echo_n "checking for gpg-error... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_GPG_ERROR" >&5
+$as_echo_n "checking for OT_DEP_GPG_ERROR... " >&6; }
 
 if test -n "$OT_DEP_GPG_ERROR_CFLAGS"; then
     pkg_cv_OT_DEP_GPG_ERROR_CFLAGS="$OT_DEP_GPG_ERROR_CFLAGS"
@@ -16040,7 +16007,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16102,7 +16069,7 @@ fi
         OT_DEP_GPG_ERROR_LIBS="$( $GPG_ERROR_CONFIG --libs )"
 
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
         # Extract the first word of "gpg-error-config", so it can be a program name with args.
@@ -16194,8 +16161,8 @@ $as_echo "#define HAVE_LIBSODIUM 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium >= $LIBSODIUM_DEPENDENCY" >&5
-$as_echo_n "checking for libsodium >= $LIBSODIUM_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_LIBSODIUM" >&5
+$as_echo_n "checking for OT_DEP_LIBSODIUM... " >&6; }
 
 if test -n "$OT_DEP_LIBSODIUM_CFLAGS"; then
     pkg_cv_OT_DEP_LIBSODIUM_CFLAGS="$OT_DEP_LIBSODIUM_CFLAGS"
@@ -16235,7 +16202,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16253,7 +16220,7 @@ fi
 
 	have_libsodium=no
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	have_libsodium=no
 else
@@ -16530,8 +16497,8 @@ $as_echo "$enable_gtk_doc" >&6; }
     if test "x$PACKAGE_NAME" != "xglib"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" >&5
-$as_echo_n "checking for glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
+$as_echo_n "checking for GTKDOC_DEPS... " >&6; }
 
 if test -n "$GTKDOC_DEPS_CFLAGS"; then
     pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS"
@@ -16571,7 +16538,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16589,7 +16556,7 @@ fi
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	:
 else
@@ -16751,143 +16718,6 @@ else
 fi
 
 
-# Check whether --enable-rust was given.
-if test "${enable_rust+set}" = set; then :
-  enableval=$enable_rust;
-else
-  enable_rust=no; rust_debug_release=no
-fi
-
-
-if test "$enable_rust" = yes; then :
-
-   # Extract the first word of "cargo", so it can be a program name with args.
-set dummy cargo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_cargo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $cargo in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_cargo="$cargo" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_cargo="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-cargo=$ac_cv_path_cargo
-if test -n "$cargo"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cargo" >&5
-$as_echo "$cargo" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test -z "$cargo"; then :
-  as_fn_error $? "cargo is required for --enable-rust" "$LINENO" 5
-fi
-   # Extract the first word of "rustc", so it can be a program name with args.
-set dummy rustc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_rustc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $rustc in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_rustc="$rustc" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_rustc="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-rustc=$ac_cv_path_rustc
-if test -n "$rustc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rustc" >&5
-$as_echo "$rustc" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   if test -z "$rustc"; then :
-  as_fn_error $? "rustc is required for --enable-rust" "$LINENO" 5
-fi
-
-
-      # Check whether --enable-rust-debug was given.
-if test "${enable_rust_debug+set}" = set; then :
-  enableval=$enable_rust_debug; rust_debug_release=$enableval
-else
-  rust_debug_release=release
-fi
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Rust code with debugging information" >&5
-$as_echo_n "checking whether to build Rust code with debugging information... " >&6; }
-   if test "x$rust_debug_release" = "xyes" ; then
-      rust_debug_release=debug
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-   fi
-   RUST_TARGET_SUBDIR=${rust_debug_release}
-
-
-fi
- if test "x$rust_debug_release" = "xdebug"; then
-  RUST_DEBUG_TRUE=
-  RUST_DEBUG_FALSE='#'
-else
-  RUST_DEBUG_TRUE='#'
-  RUST_DEBUG_FALSE=
-fi
-
- if test "$enable_rust" != no; then
-  ENABLE_RUST_TRUE=
-  ENABLE_RUST_FALSE='#'
-else
-  ENABLE_RUST_TRUE='#'
-  ENABLE_RUST_FALSE=
-fi
-
-
 
 # Check whether --with-libarchive was given.
 if test "${with_libarchive+set}" = set; then :
@@ -16925,8 +16755,8 @@ $as_echo "#define HAVE_LIBARCHIVE 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBARCHIVE_DEPENDENCY" >&5
-$as_echo_n "checking for $LIBARCHIVE_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_LIBARCHIVE" >&5
+$as_echo_n "checking for OT_DEP_LIBARCHIVE... " >&6; }
 
 if test -n "$OT_DEP_LIBARCHIVE_CFLAGS"; then
     pkg_cv_OT_DEP_LIBARCHIVE_CFLAGS="$OT_DEP_LIBARCHIVE_CFLAGS"
@@ -16966,7 +16796,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16993,7 +16823,7 @@ Alternatively, you may set the environment variables OT_DEP_LIBARCHIVE_CFLAGS
 and OT_DEP_LIBARCHIVE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17088,8 +16918,8 @@ $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SELINUX_DEPENDENCY" >&5
-$as_echo_n "checking for $SELINUX_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_SELINUX" >&5
+$as_echo_n "checking for OT_DEP_SELINUX... " >&6; }
 
 if test -n "$OT_DEP_SELINUX_CFLAGS"; then
     pkg_cv_OT_DEP_SELINUX_CFLAGS="$OT_DEP_SELINUX_CFLAGS"
@@ -17129,7 +16959,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17156,7 +16986,7 @@ Alternatively, you may set the environment variables OT_DEP_SELINUX_CFLAGS
 and OT_DEP_SELINUX_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17255,8 +17085,8 @@ if  test x$with_openssl != xno ; then :
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $OPENSSL_DEPENDENCY" >&5
-$as_echo_n "checking for $OPENSSL_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_CRYPTO" >&5
+$as_echo_n "checking for OT_DEP_CRYPTO... " >&6; }
 
 if test -n "$OT_DEP_CRYPTO_CFLAGS"; then
     pkg_cv_OT_DEP_CRYPTO_CFLAGS="$OT_DEP_CRYPTO_CFLAGS"
@@ -17296,7 +17126,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17323,7 +17153,7 @@ Alternatively, you may set the environment variables OT_DEP_CRYPTO_CFLAGS
 and OT_DEP_CRYPTO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17370,8 +17200,8 @@ if  test $with_crypto = gnutls ; then :
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GNUTLS_DEPENDENCY" >&5
-$as_echo_n "checking for $GNUTLS_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_CRYPTO" >&5
+$as_echo_n "checking for OT_DEP_CRYPTO... " >&6; }
 
 if test -n "$OT_DEP_CRYPTO_CFLAGS"; then
     pkg_cv_OT_DEP_CRYPTO_CFLAGS="$OT_DEP_CRYPTO_CFLAGS"
@@ -17411,7 +17241,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17438,7 +17268,7 @@ Alternatively, you may set the environment variables OT_DEP_CRYPTO_CFLAGS
 and OT_DEP_CRYPTO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17513,8 +17343,8 @@ $as_echo "#define HAVE_AVAHI 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $AVAHI_DEPENDENCY" >&5
-$as_echo_n "checking for $AVAHI_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_AVAHI" >&5
+$as_echo_n "checking for OT_DEP_AVAHI... " >&6; }
 
 if test -n "$OT_DEP_AVAHI_CFLAGS"; then
     pkg_cv_OT_DEP_AVAHI_CFLAGS="$OT_DEP_AVAHI_CFLAGS"
@@ -17554,7 +17384,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17581,7 +17411,7 @@ Alternatively, you may set the environment variables OT_DEP_AVAHI_CFLAGS
 and OT_DEP_AVAHI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17662,8 +17492,8 @@ $as_echo "#define HAVE_LIBMOUNT 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBMOUNT_DEPENDENCY" >&5
-$as_echo_n "checking for $LIBMOUNT_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_LIBMOUNT" >&5
+$as_echo_n "checking for OT_DEP_LIBMOUNT... " >&6; }
 
 if test -n "$OT_DEP_LIBMOUNT_CFLAGS"; then
     pkg_cv_OT_DEP_LIBMOUNT_CFLAGS="$OT_DEP_LIBMOUNT_CFLAGS"
@@ -17703,7 +17533,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17730,7 +17560,7 @@ Alternatively, you may set the environment variables OT_DEP_LIBMOUNT_CFLAGS
 and OT_DEP_LIBMOUNT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17798,8 +17628,8 @@ if  test x$enable_rofiles_fuse != xno ; then :
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FUSE_DEPENDENCY" >&5
-$as_echo_n "checking for $FUSE_DEPENDENCY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILDOPT_FUSE" >&5
+$as_echo_n "checking for BUILDOPT_FUSE... " >&6; }
 
 if test -n "$BUILDOPT_FUSE_CFLAGS"; then
     pkg_cv_BUILDOPT_FUSE_CFLAGS="$BUILDOPT_FUSE_CFLAGS"
@@ -17839,7 +17669,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17866,7 +17696,7 @@ Alternatively, you may set the environment variables BUILDOPT_FUSE_CFLAGS
 and BUILDOPT_FUSE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17985,8 +17815,8 @@ $as_echo "#define HAVE_LIBSYSTEMD 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
-$as_echo_n "checking for libsystemd... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5
+$as_echo_n "checking for LIBSYSTEMD... " >&6; }
 
 if test -n "$LIBSYSTEMD_CFLAGS"; then
     pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_CFLAGS"
@@ -18026,7 +17856,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18053,7 +17883,7 @@ Alternatively, you may set the environment variables LIBSYSTEMD_CFLAGS
 and LIBSYSTEMD_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18142,6 +17972,22 @@ fi
 if test x$with_libsystemd = xyes; then OSTREE_FEATURES="$OSTREE_FEATURES systemd"; fi
 
 
+# Check whether --with-modern-grub was given.
+if test "${with_modern_grub+set}" = set; then :
+  withval=$with_modern_grub;
+else
+  with_modern_grub=no
+fi
+
+if  test x$with_modern_grub = xyes; then :
+
+
+$as_echo "#define WITH_MODERN_GRUB 1" >>confdefs.h
+
+
+fi
+
+
 # Check whether --with-builtin-grub2-mkconfig was given.
 if test "${with_builtin_grub2_mkconfig+set}" = set; then :
   withval=$with_builtin_grub2_mkconfig;
@@ -18577,14 +18423,6 @@ if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${RUST_DEBUG_TRUE}" && test -z "${RUST_DEBUG_FALSE}"; then
-  as_fn_error $? "conditional \"RUST_DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_RUST_TRUE}" && test -z "${ENABLE_RUST_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_RUST\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${USE_LIBARCHIVE_TRUE}" && test -z "${USE_LIBARCHIVE_FALSE}"; then
   as_fn_error $? "conditional \"USE_LIBARCHIVE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19054,7 +18892,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libostree $as_me 2020.8, which was
+This file was extended by libostree $as_me 2021.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19120,7 +18958,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libostree config.status 2020.8
+libostree config.status 2021.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20245,6 +20083,7 @@ See \`config.log' for more details" "$LINENO" 5; }
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -20818,7 +20657,6 @@ echo "
 
 
     introspection:                                $found_introspection
-    Rust (internal oxidation):                    $rust_debug_release
     rofiles-fuse:                                 $enable_rofiles_fuse
     HTTP backend:                                 $fetcher_backend
     \"ostree trivial-httpd\":                       $enable_trivial_httpd_cmdline
diff --git a/configure.ac b/configure.ac
index 088acc3d..26713077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,7 @@
 AC_PREREQ([2.63])
-dnl To do a release: follow the instructions to update libostree-released.sym from
-dnl libostree-devel.sym, update the checksum in test-symbols.sh, set is_release_build=yes
-dnl below. Then make another post-release commit to bump the version and set
-dnl is_release_build=no.
-dnl Seed the release notes with `git-shortlog-with-prs ..`. Then use
-dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach
-dnl the tarball from `make dist`.
-m4_define([year_version], [2020])
-m4_define([release_version], [8])
+dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`.
+m4_define([year_version], [2021])
+m4_define([release_version], [1])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
 is_release_build=yes
@@ -57,16 +51,17 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
 ])])
 AC_SUBST(WARN_CFLAGS)
 
-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])
-AM_COND_IF([BUILDOPT_ASAN],
-  [AC_DEFINE([BUILDOPT_ASAN], 1, [Define if we are building with -fsanitize=address])])
+AC_ARG_ENABLE(sanitizers,
+              AS_HELP_STRING([--enable-sanitizers],
+                             [Enable ASAN and UBSAN (default: no)]),,
+              [enable_sanitizers=no])
+AM_CONDITIONAL(BUILDOPT_ASAN, [test x$enable_sanitizers != xno])
+AM_COND_IF([BUILDOPT_ASAN], [
+  sanitizer_flags="-fsanitize=address -fsanitize=undefined -fsanitize-undefined-trap-on-error"
+  CFLAGS="$CFLAGS ${sanitizer_flags}"
+  CXXFLAGS="$CXXFLAGS ${sanitizer_flags}"
+  AC_DEFINE([BUILDOPT_ASAN], 1, [Define if we are building with asan and ubsan])
+])
 
 AC_MSG_CHECKING([for -fsanitize=thread in CFLAGS])
 if echo $CFLAGS | grep -q -e -fsanitize=thread; then
@@ -292,39 +287,6 @@ AS_IF([test "$enable_man" != no], [
 ])
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 
-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])
-
 AC_ARG_WITH(libarchive,
 	    AS_HELP_STRING([--without-libarchive], [Do not use libarchive]),
 	    :, with_libarchive=maybe)
@@ -553,6 +515,14 @@ AM_COND_IF(BUILDOPT_SYSTEMD_AND_LIBMOUNT,
   AC_DEFINE([BUILDOPT_LIBSYSTEMD_AND_LIBMOUNT], 1, [Define if systemd and libmount]))
 if test x$with_libsystemd = xyes; then OSTREE_FEATURES="$OSTREE_FEATURES systemd"; fi
 
+AC_ARG_WITH(modern-grub,
+	    AS_HELP_STRING([--with-modern-grub],
+                           [Omit grub linux and initrd suffixes for EFI/BIOS booting on GRUB >2.02 (default: no)]),,
+              [with_modern_grub=no])
+AS_IF([ test x$with_modern_grub = xyes], [
+  AC_DEFINE([WITH_MODERN_GRUB], 1, [Define if we have a GRUB version newer than 2.02])
+])
+
 AC_ARG_WITH(builtin-grub2-mkconfig,
             AS_HELP_STRING([--with-builtin-grub2-mkconfig],
                            [Use a builtin minimal grub2-mkconfig to generate a GRUB2 configuration file (default: no)]),,
@@ -633,7 +603,6 @@ echo "
 
 
     introspection:                                $found_introspection
-    Rust (internal oxidation):                    $rust_debug_release
     rofiles-fuse:                                 $enable_rofiles_fuse
     HTTP backend:                                 $fetcher_backend
     \"ostree trivial-httpd\":                       $enable_trivial_httpd_cmdline
diff --git a/gtk-doc.make b/gtk-doc.make
index 7d9a27f3..c673175d 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -57,6 +57,7 @@ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).actions	 \
 	$(DOC_MODULE).args 	 \
 	$(DOC_MODULE).hierarchy  \
 	$(DOC_MODULE).interfaces \
diff --git a/man/ostree-commit.xml b/man/ostree-commit.xml
index ab5d3415..81af7bf2 100644
--- a/man/ostree-commit.xml
+++ b/man/ostree-commit.xml
@@ -186,6 +186,13 @@ Boston, MA 02111-1307, USA.
                 
             
 
+            
+                
+                
+                    Inject standard metadata for a bootable Linux filesystem tree.
+                
+            
+
             
                 
 
diff --git a/man/ostree-pull-local.xml b/man/ostree-pull-local.xml
index 2bfb2b0f..8bbf36a9 100644
--- a/man/ostree-pull-local.xml
+++ b/man/ostree-pull-local.xml
@@ -90,6 +90,14 @@ Boston, MA 02111-1307, USA.
                     Do not trust source, verify checksums and don't hardlink into source.
                 
             
+
+            
+                
+
+                
+                    Disable verification of commit metadata bindings.
+                
+            
         
     
 
diff --git a/man/ostree-pull.xml b/man/ostree-pull.xml
index 0606f690..593b2d27 100644
--- a/man/ostree-pull.xml
+++ b/man/ostree-pull.xml
@@ -137,6 +137,14 @@ Boston, MA 02111-1307, USA.
                     Specifies how many times each download should be retried upon error (default: 5)
                 
             
+
+            
+                
+
+                
+                    Disable verification of commit metadata bindings.
+                
+            
         
     
 
diff --git a/man/ostree.repo-config.xml b/man/ostree.repo-config.xml
index 6fead168..335f83e4 100644
--- a/man/ostree.repo-config.xml
+++ b/man/ostree.repo-config.xml
@@ -78,7 +78,7 @@ Boston, MA 02111-1307, USA.
     
       
         mode
-        One of bare, bare-user or archive-z2 (note that archive is used everywhere else.)
+        One of bare, bare-user, bare-user-only, or archive-z2 (note that archive is used everywhere else.)
       
 
       
diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index 4f80d7fc..f1c773b3 100644
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -638,6 +638,12 @@ global:
   ostree_repo_gpg_sign_data;
 } LIBOSTREE_2020.7;
 
+LIBOSTREE_2021.1 {
+global:
+  ostree_commit_metadata_for_bootable;
+  ostree_sysroot_require_booted_deployment;
+} LIBOSTREE_2020.8;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */
diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
index ceea682e..0ef751dc 100644
--- a/src/libostree/ostree-bootloader-grub2.c
+++ b/src/libostree/ostree-bootloader-grub2.c
@@ -28,25 +28,26 @@
 
 #include 
 
-/* I only did some cursory research here, but it appears
- * that we only want to use "linux16" for x86 platforms.
- * At least, I got a report that "linux16" is definitely wrong
- * for ppc64.  See
- * http://pkgs.fedoraproject.org/cgit/rpms/grub2.git/tree/0036-Use-linux16-when-appropriate-880840.patch?h=f25
- * https://bugzilla.redhat.com/show_bug.cgi?id=1108296
- * among others.
+/* Maintain backwards compatibility with legacy GRUB
+ * installations that might rely on the -16 suffix
+ * for real-mode booting.
+ * Allow us to override this at build time if we're
+ * using a modern GRUB installation.
  */
-#if defined(__i386__) || defined(__x86_64__)
+#if !defined(WITH_MODERN_GRUB) && ( defined(__i386__) || defined(__x86_64__) )
 #define GRUB2_SUFFIX "16"
 #else
 #define GRUB2_SUFFIX ""
 #endif
-/* https://github.com/projectatomic/rpm-ostree-toolbox/issues/102#issuecomment-316483554
- * https://github.com/rhboot/grubby/blob/34b1436ccbd56eab8024314cab48f2fc880eef08/grubby.c#L63
- *
- * This is true at least on Fedora/Red Hat Enterprise Linux for aarch64.
+/* Maintain backwards compatibility with legacy GRUB
+ * installations that might rely on the -efi suffix
+ * for RHEL/fedora-based distros.
+ * Allow us to override this at build time if we're
+ * using a modern GRUB installation that makes the
+ * suffix-less linux/initrd commands synonymous for
+ * both EFI and BIOS booting.
  */
-#if defined(__aarch64__)
+#if defined(WITH_MODERN_GRUB) || defined(__aarch64__)
 #define GRUB2_EFI_SUFFIX ""
 #else
 #define GRUB2_EFI_SUFFIX "efi"
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 690075e1..9d5c6d3b 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -33,9 +33,6 @@
 #include 
 #include 
 #include 
-#ifdef HAVE_LINUX_FSVERITY_H
-#include 
-#endif
 
 #include "otutil.h"
 #include "ostree.h"
@@ -190,113 +187,6 @@ ot_security_smack_reset_fd (int fd)
 #endif
 }
 
-/* Wrapper around the fsverity ioctl, compressing the result to
- * "success, unsupported or error".  This is used for /boot where
- * we enable verity if supported.
- * */
-gboolean
-_ostree_tmpf_fsverity_core (GLnxTmpfile *tmpf,
-                            _OstreeFeatureSupport fsverity_requested,
-                            gboolean    *supported,
-                            GError     **error)
-{
-  /* Set this by default to simplify the code below */
-  if (supported)
-    *supported = FALSE;
-
-  if (fsverity_requested == _OSTREE_FEATURE_NO)
-    return TRUE;
-
-#ifdef HAVE_LINUX_FSVERITY_H
-  GLNX_AUTO_PREFIX_ERROR ("fsverity", error);
-
-  /* fs-verity requires a read-only file descriptor */
-  if (!glnx_tmpfile_reopen_rdonly (tmpf, error))
-    return FALSE;
-
-  struct fsverity_enable_arg arg = { 0, };
-  arg.version = 1;
-  arg.hash_algorithm =  FS_VERITY_HASH_ALG_SHA256;  /* TODO configurable? */
-  arg.block_size = 4096; /* FIXME query */
-  arg.salt_size = 0; /* TODO store salt in ostree repo config */
-  arg.salt_ptr = 0;
-  arg.sig_size = 0; /* We don't currently expect use of in-kernel signature verification */
-  arg.sig_ptr = 0;
-
-  if (ioctl (tmpf->fd, FS_IOC_ENABLE_VERITY, &arg) < 0)
-    {
-      switch (errno)
-        {
-          case ENOTTY:
-          case EOPNOTSUPP:
-            return TRUE;
-          default:
-            return glnx_throw_errno_prefix (error, "ioctl(FS_IOC_ENABLE_VERITY)");
-        }
-    }
-  
-  if (supported)
-    *supported = TRUE;
-#endif
-  return TRUE;
-}
-
-/* Enable verity on a file, respecting the "wanted" and "supported" states.
- * The main idea here is to optimize out pointlessly calling the ioctl()
- * over and over in cases where it's not supported for the repo's filesystem,
- * as well as to support "opportunistic" use (requested and if filesystem supports).
- * */
-gboolean
-_ostree_tmpf_fsverity (OstreeRepo  *self,
-                       GLnxTmpfile *tmpf,
-                       GError    **error)
-{
-#ifdef HAVE_LINUX_FSVERITY_H
-  g_mutex_lock (&self->txn_lock);
-  _OstreeFeatureSupport fsverity_wanted = self->fs_verity_wanted;
-  _OstreeFeatureSupport fsverity_supported = self->fs_verity_supported;
-  g_mutex_unlock (&self->txn_lock);
-
-  switch (fsverity_wanted)
-    {
-      case _OSTREE_FEATURE_YES:
-        {
-          if (fsverity_supported == _OSTREE_FEATURE_NO)
-            return glnx_throw (error, "fsverity required but filesystem does not support it");
-        }
-        break;
-      case _OSTREE_FEATURE_MAYBE:
-        break;
-      case _OSTREE_FEATURE_NO:
-        return TRUE;
-    }
-
-  gboolean supported = FALSE;
-  if (!_ostree_tmpf_fsverity_core (tmpf, fsverity_wanted, &supported, error))
-    return FALSE;
-
-  if (!supported)
-    {
-      if (G_UNLIKELY (fsverity_wanted == _OSTREE_FEATURE_YES))
-        return glnx_throw (error, "fsverity required but filesystem does not support it");
-
-      /* If we got here, we must be trying "opportunistic" use of fs-verity */
-      g_assert_cmpint (fsverity_wanted, ==, _OSTREE_FEATURE_MAYBE);
-      g_mutex_lock (&self->txn_lock);
-      self->fs_verity_supported = _OSTREE_FEATURE_NO;
-      g_mutex_unlock (&self->txn_lock);
-      return TRUE;
-    }
-  
-  g_mutex_lock (&self->txn_lock);
-  self->fs_verity_supported = _OSTREE_FEATURE_YES;
-  g_mutex_unlock (&self->txn_lock);
-#else
-  g_assert_cmpint (self->fs_verity_wanted, !=, _OSTREE_FEATURE_YES);
-#endif
-  return TRUE;
-}
-
 /* Given an O_TMPFILE regular file, link it into place. */
 gboolean
 _ostree_repo_commit_tmpf_final (OstreeRepo        *self,
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index ef7252e8..96b34c18 100644
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -458,12 +458,43 @@ aic_get_xattrs (OstreeRepoArchiveImportContext *ctx,
   g_autoptr(GVariant) xattrs = NULL;
   const char *cb_path = abspath;
 
+  gboolean no_xattrs = ctx->modifier &&
+      ctx->modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS;
+
+  if (!no_xattrs && archive_entry_xattr_count (ctx->entry) > 0)
+    {
+      const char *name;
+      const void *value;
+      size_t size;
+
+      g_autoptr(GVariantBuilder) builder =
+        ot_util_variant_builder_from_variant (xattrs,
+                                              G_VARIANT_TYPE ("a(ayay)"));
+
+      archive_entry_xattr_reset (ctx->entry);
+      while (archive_entry_xattr_next (
+               ctx->entry, &name, &value, &size) == ARCHIVE_OK)
+        {
+          g_variant_builder_add (builder, "(@ay@ay)",
+                                 g_variant_new_bytestring (name),
+                                 g_variant_new_fixed_array (G_VARIANT_TYPE("y"),
+                                                            value, size, 1));
+        }
+
+      xattrs = g_variant_builder_end (builder);
+      g_variant_ref_sink (xattrs);
+    }
+
   if (ctx->opts->callback_with_entry_pathname)
     cb_path = archive_entry_pathname (ctx->entry);
 
   if (ctx->modifier && ctx->modifier->xattr_callback)
-    xattrs = ctx->modifier->xattr_callback (ctx->repo, cb_path, file_info,
-                                            ctx->modifier->xattr_user_data);
+    {
+      if (xattrs)
+        g_variant_unref (xattrs);
+      xattrs = ctx->modifier->xattr_callback (ctx->repo, cb_path, file_info,
+                                              ctx->modifier->xattr_user_data);
+    }
 
   if (ctx->modifier && ctx->modifier->sepolicy)
     {
diff --git a/src/libostree/ostree-repo-os.c b/src/libostree/ostree-repo-os.c
new file mode 100644
index 00000000..96beddda
--- /dev/null
+++ b/src/libostree/ostree-repo-os.c
@@ -0,0 +1,83 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.0+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "libglnx.h"
+#include "ostree.h"
+#include "ostree-core-private.h"
+#include "ostree-repo-os.h"
+#include "otutil.h"
+
+/**
+ * ostree_commit_metadata_for_bootable:
+ * @root: Root filesystem to be committed
+ * @dict: Dictionary to update
+ *
+ * Update provided @dict with standard metadata for bootable OSTree commits.
+ * Since: 2021.1
+ */
+_OSTREE_PUBLIC
+gboolean
+ostree_commit_metadata_for_bootable (GFile *root, GVariantDict *dict, GCancellable *cancellable, GError **error)
+{
+  g_autoptr(GFile) modules = g_file_resolve_relative_path (root, "usr/lib/modules");
+  g_autoptr(GFileEnumerator) dir_enum 
+    = g_file_enumerate_children (modules, OSTREE_GIO_FAST_QUERYINFO,
+                                 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                 cancellable, error);
+  if (!dir_enum)
+    return glnx_prefix_error (error, "Opening usr/lib/modules");
+
+  g_autofree char *linux_release = NULL;
+  while (TRUE)
+    {
+      GFileInfo *child_info;
+      GFile *child_path;
+      if (!g_file_enumerator_iterate (dir_enum, &child_info, &child_path,
+                                      cancellable, error))
+        return FALSE;
+      if (child_info == NULL)
+        break;
+      if (g_file_info_get_file_type (child_info) != G_FILE_TYPE_DIRECTORY)
+        continue;
+    
+      g_autoptr(GFile) kernel_path = g_file_resolve_relative_path (child_path, "vmlinuz");
+      if (!g_file_query_exists (kernel_path, NULL))
+        continue;
+
+      if (linux_release != NULL)
+        return glnx_throw (error, "Multiple kernels found in /usr/lib/modules");
+
+      linux_release = g_strdup (g_file_info_get_name (child_info));
+    }
+
+  if (linux_release)
+    {
+      g_variant_dict_insert (dict, OSTREE_METADATA_KEY_BOOTABLE, "b", TRUE);
+      g_variant_dict_insert (dict, OSTREE_METADATA_KEY_LINUX, "s", linux_release);
+      return TRUE;
+    }
+  return glnx_throw (error, "No kernel found in /usr/lib/modules");
+}
diff --git a/src/libostree/ostree-repo-os.h b/src/libostree/ostree-repo-os.h
new file mode 100644
index 00000000..b2443768
--- /dev/null
+++ b/src/libostree/ostree-repo-os.h
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.0+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+G_BEGIN_DECLS
+
+/** 
+ * OSTREE_METADATA_KEY_BOOTABLE:
+ *
+ * GVariant type `b`: Set if this commit is intended to be bootable
+ * Since: 2021.1
+ */
+#define OSTREE_METADATA_KEY_BOOTABLE "ostree.bootable"
+/** 
+ * OSTREE_METADATA_KEY_LINUX:
+ *
+ * GVariant type `s`: Contains the Linux kernel release (i.e. `uname -r`)
+ * Since: 2021.1
+ */
+#define OSTREE_METADATA_KEY_LINUX "ostree.linux"
+
+_OSTREE_PUBLIC
+gboolean
+ostree_commit_metadata_for_bootable (GFile *root, GVariantDict *dict, GCancellable *cancellable, GError **error);
+
+G_END_DECLS
diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
index 714fda8b..6c01bc6b 100644
--- a/src/libostree/ostree-repo-private.h
+++ b/src/libostree/ostree-repo-private.h
@@ -521,6 +521,8 @@ OstreeRepoAutoLock * _ostree_repo_auto_lock_push (OstreeRepo          *self,
 void          _ostree_repo_auto_lock_cleanup (OstreeRepoAutoLock *lock);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeRepoAutoLock, _ostree_repo_auto_lock_cleanup)
 
+gboolean _ostree_repo_parse_fsverity_config (OstreeRepo *self, GError **error);
+
 gboolean
 _ostree_tmpf_fsverity_core (GLnxTmpfile *tmpf,
                             _OstreeFeatureSupport fsverity_requested,
diff --git a/src/libostree/ostree-repo-pull-private.h b/src/libostree/ostree-repo-pull-private.h
index a827557a..59b72e88 100644
--- a/src/libostree/ostree-repo-pull-private.h
+++ b/src/libostree/ostree-repo-pull-private.h
@@ -70,6 +70,7 @@ typedef struct {
   gboolean          require_static_deltas;
   gboolean          disable_static_deltas;
   gboolean          has_tombstone_commits;
+  gboolean          disable_verify_bindings;
 
   GBytes           *summary_data;
   char             *summary_etag;
@@ -87,7 +88,7 @@ typedef struct {
   GHashTable       *ref_keyring_map; /* Maps OstreeCollectionRef to keyring remote name */
   GPtrArray        *static_delta_superblocks;
   GHashTable       *expected_commit_sizes; /* Maps commit checksum to known size */
-  GHashTable       *commit_to_depth; /* Maps commit checksum maximum depth */
+  GHashTable       *commit_to_depth; /* Maps parent commit checksum maximum depth */
   GHashTable       *scanned_metadata; /* Maps object name to itself */
   GHashTable       *fetched_detached_metadata; /* Map */
   GHashTable       *requested_metadata; /* Maps object name to itself */
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 758c5054..ab47a2a4 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -706,7 +706,7 @@ scan_dirtree_object (OtPullData   *pull_data,
        *     before libostree's validation was strengthened.
        */
       if (!ot_util_filename_validate (filename, error))
-        return FALSE;
+        return glnx_prefix_error (error, "File %u in dirtree", i);
 
       /* Skip files if we're traversing a request only directory, unless it exactly
        * matches the path */
@@ -781,7 +781,7 @@ scan_dirtree_object (OtPullData   *pull_data,
 
       /* See comment above for files */
       if (!ot_util_filename_validate (dirname, error))
-        return FALSE;
+        return glnx_prefix_error (error, "Dir %u in dirtree", i);
 
       if (!pull_matches_subdir (pull_data, path, dirname, TRUE))
         continue;
@@ -1113,6 +1113,18 @@ on_metadata_written (GObject           *object,
   check_outstanding_requests_handle_error (pull_data, &local_error);
 }
 
+static gboolean
+is_parent_commit (OtPullData *pull_data,
+                  const char *checksum)
+{
+  /* FIXME: Only parent commits are added to the commit_to_depth table,
+   * so if the checksum isn't in the table then a new commit chain is
+   * being started. However, if the desired commit was a parent in a
+   * previously followed chain, then this will be wrong.
+   */
+  return g_hash_table_contains (pull_data->commit_to_depth, checksum);
+}
+
 static void
 meta_fetch_on_complete (GObject           *object,
                         GAsyncResult      *result,
@@ -1155,10 +1167,13 @@ meta_fetch_on_complete (GObject           *object,
             }
 
           /* When traversing parents, do not fail on a missing commit.
-           * We may be pulling from a partial repository that ends in
-           * a dangling parent reference. */
+           * We may be pulling from a partial repository that ends in a
+           * dangling parent reference. This logic should match the
+           * local case in scan_one_metadata_object.
+           */
           else if (objtype == OSTREE_OBJECT_TYPE_COMMIT &&
-                   pull_data->maxdepth != 0)
+                   pull_data->maxdepth != 0 &&
+                   is_parent_commit (pull_data, checksum))
             {
               g_clear_error (&local_error);
               /* If the remote repo supports tombstone commits, check if the commit was intentionally
@@ -1542,8 +1557,6 @@ scan_commit_object (OtPullData                 *pull_data,
   else
     {
       depth = pull_data->maxdepth;
-      g_hash_table_insert (pull_data->commit_to_depth, g_strdup (checksum),
-                           GINT_TO_POINTER (depth));
     }
 
 #ifndef OSTREE_DISABLE_GPGME
@@ -1620,15 +1633,19 @@ scan_commit_object (OtPullData                 *pull_data,
   if (!ostree_repo_load_commit (pull_data->repo, checksum, &commit, &commitstate, error))
     return FALSE;
 
-  /* If ref is non-NULL then the commit we fetched was requested through the
-   * branch, otherwise we requested a commit checksum without specifying a branch.
-   */
-  g_autofree char *remote_collection_id = NULL;
-  remote_collection_id = get_remote_repo_collection_id (pull_data);
-  if (!_ostree_repo_verify_bindings (remote_collection_id,
-                                     (ref != NULL) ? ref->ref_name : NULL,
-                                     commit, error))
-    return glnx_prefix_error (error, "Commit %s", checksum);
+  if (!pull_data->disable_verify_bindings)
+    {
+      /* If ref is non-NULL then the commit we fetched was requested through
+       * the branch, otherwise we requested a commit checksum without
+       * specifying a branch.
+       */
+      g_autofree char *remote_collection_id = NULL;
+      remote_collection_id = get_remote_repo_collection_id (pull_data);
+      if (!_ostree_repo_verify_bindings (remote_collection_id,
+                                         (ref != NULL) ? ref->ref_name : NULL,
+                                         commit, error))
+        return glnx_prefix_error (error, "Commit %s", checksum);
+    }
 
   guint64 new_ts = ostree_commit_get_timestamp (commit);
   if (pull_data->timestamp_check)
@@ -1680,40 +1697,19 @@ scan_commit_object (OtPullData                 *pull_data,
         return FALSE;
     }
 
-  if (parent_csum_bytes != NULL && pull_data->maxdepth == -1)
-    {
-      queue_scan_one_metadata_object_c (pull_data, parent_csum_bytes,
-                                        OSTREE_OBJECT_TYPE_COMMIT, NULL,
-                                        recursion_depth + 1, NULL);
-    }
-  else if (parent_csum_bytes != NULL && depth > 0)
+  if (parent_csum_bytes != NULL && (pull_data->maxdepth == -1 || depth > 0))
     {
       char parent_checksum[OSTREE_SHA256_STRING_LEN+1];
-      gpointer parent_depthp;
-      int parent_depth;
-
       ostree_checksum_inplace_from_bytes (parent_csum_bytes, parent_checksum);
 
-      if (g_hash_table_lookup_extended (pull_data->commit_to_depth, parent_checksum,
-                                        NULL, &parent_depthp))
-        {
-          parent_depth = GPOINTER_TO_INT (parent_depthp);
-        }
-      else
-        {
-          parent_depth = depth - 1;
-        }
-
-      if (parent_depth >= 0)
-        {
-          g_hash_table_insert (pull_data->commit_to_depth, g_strdup (parent_checksum),
-                               GINT_TO_POINTER (parent_depth));
-          queue_scan_one_metadata_object_c (pull_data, parent_csum_bytes,
-                                            OSTREE_OBJECT_TYPE_COMMIT,
-                                            NULL,
-                                            recursion_depth + 1,
-                                            NULL);
-        }
+      int parent_depth = (depth > 0) ? depth - 1 : -1;
+      g_hash_table_insert (pull_data->commit_to_depth, g_strdup (parent_checksum),
+                           GINT_TO_POINTER (parent_depth));
+      queue_scan_one_metadata_object_c (pull_data, parent_csum_bytes,
+                                        OSTREE_OBJECT_TYPE_COMMIT,
+                                        NULL,
+                                        recursion_depth + 1,
+                                        NULL);
     }
 
   /* We only recurse to looking whether we need dirtree/dirmeta
@@ -1826,10 +1822,46 @@ scan_one_metadata_object (OtPullData                 *pull_data,
             return FALSE;
         }
 
+      g_autoptr(GError) local_error = NULL;
       if (!_ostree_repo_import_object (pull_data->repo, pull_data->remote_repo_local,
                                        objtype, checksum, pull_data->importflags,
-                                       cancellable, error))
-        return FALSE;
+                                       cancellable, &local_error))
+        {
+          /* When traversing parents, do not fail on a missing commit.
+           * We may be pulling from a partial repository that ends in a
+           * dangling parent reference. This logic should match the
+           * remote case in meta_fetch_on_complete.
+           *
+           * Note early return.
+           */
+          if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) &&
+              objtype == OSTREE_OBJECT_TYPE_COMMIT &&
+              pull_data->maxdepth != 0 &&
+              is_parent_commit (pull_data, checksum))
+            {
+              g_clear_error (&local_error);
+
+              /* If the remote repo supports tombstone commits, check if
+               * the commit was intentionally deleted.
+               */
+              if (pull_data->has_tombstone_commits)
+                {
+                  if (!_ostree_repo_import_object (pull_data->repo, pull_data->remote_repo_local,
+                                                   OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT,
+                                                   checksum, pull_data->importflags,
+                                                   cancellable, error))
+                    return FALSE;
+                }
+
+              return TRUE;
+            }
+          else
+            {
+              g_propagate_error (error, g_steal_pointer (&local_error));
+              return FALSE;
+            }
+        }
+
       /* The import API will fetch both the commit and detached metadata, so
        * add it to the hash to avoid re-fetching it below.
        */
@@ -1902,7 +1934,7 @@ scan_one_metadata_object (OtPullData                 *pull_data,
     {
       if (!scan_dirtree_object (pull_data, checksum, path, recursion_depth,
                                 pull_data->cancellable, error))
-        return FALSE;
+        return glnx_prefix_error (error, "Validating dirtree %s (%s)", checksum, path);
 
       g_hash_table_add (pull_data->scanned_metadata, g_variant_ref (object));
       pull_data->n_scanned_metadata++;
@@ -3670,6 +3702,8 @@ all_requested_refs_have_commit (GHashTable *requested_refs /* (element-type Ostr
  *     specified, the `summary` will be downloaded from the remote. Since: 2020.5
  *   * `summary-sig-bytes` (`ay`): Contents of the `summary.sig` file. If this
  *     is specified, `summary-bytes` must also be specified. Since: 2020.5
+ *   * `disable-verify-bindings` (`b`): Disable verification of commit bindings.
+ *     Since: 2020.9
  */
 gboolean
 ostree_repo_pull_with_options (OstreeRepo             *self,
@@ -3771,6 +3805,7 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
 	g_variant_lookup (options, "ref-keyring-map", "a(sss)", &ref_keyring_map_iter);
       (void) g_variant_lookup (options, "summary-bytes", "@ay", &summary_bytes_v);
       (void) g_variant_lookup (options, "summary-sig-bytes", "@ay", &summary_sig_bytes_v);
+      (void) g_variant_lookup (options, "disable-verify-bindings", "b", &pull_data->disable_verify_bindings);
 
       if (pull_data->remote_refspec_name != NULL)
         pull_data->remote_name = g_strdup (pull_data->remote_refspec_name);
@@ -4069,24 +4104,25 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
                                            &configured_branches, error))
     goto out;
 
-  /* TODO reindent later */
-  { OstreeFetcherURI *first_uri = pull_data->meta_mirrorlist->pdata[0];
+  /* Handle file:// URIs */
+  {
+    OstreeFetcherURI *first_uri = pull_data->meta_mirrorlist->pdata[0];
     g_autofree char *first_scheme = _ostree_fetcher_uri_get_scheme (first_uri);
 
-  /* NB: we don't support local mirrors in mirrorlists, so if this passes, it
-   * means that we're not using mirrorlists (see also fetch_mirrorlist())
-   * Also, we explicitly disable the "local repo" path if static deltas
-   * were explicitly requested to be required; this is going to happen
-   * most often for testing deltas without setting up a HTTP server.
-   */
-  if (g_str_equal (first_scheme, "file") && !pull_data->require_static_deltas)
-    {
-      g_autofree char *path = _ostree_fetcher_uri_get_path (first_uri);
-      g_autoptr(GFile) remote_repo_path = g_file_new_for_path (path);
-      pull_data->remote_repo_local = ostree_repo_new (remote_repo_path);
-      if (!ostree_repo_open (pull_data->remote_repo_local, cancellable, error))
-        goto out;
-    }
+    /* NB: we don't support local mirrors in mirrorlists, so if this passes, it
+     * means that we're not using mirrorlists (see also fetch_mirrorlist())
+     * Also, we explicitly disable the "local repo" path if static deltas
+     * were explicitly requested to be required; this is going to happen
+     * most often for testing deltas without setting up a HTTP server.
+     */
+    if (g_str_equal (first_scheme, "file") && !pull_data->require_static_deltas)
+      {
+        g_autofree char *uri = _ostree_fetcher_uri_to_string (first_uri);
+        g_autoptr(GFile) remote_repo_path = g_file_new_for_uri (uri);
+        pull_data->remote_repo_local = ostree_repo_new (remote_repo_path);
+        if (!ostree_repo_open (pull_data->remote_repo_local, cancellable, error))
+          goto out;
+      }
   }
 
   /* Change some option defaults if we're actually pulling from a local
@@ -6639,7 +6675,7 @@ ostree_repo_remote_fetch_summary_with_options (OstreeRepo    *self,
         return FALSE;
     }
 
-  if (signatures)
+  if (signatures && !summary)
     {
       if (!_ostree_repo_load_cache_summary_if_same_sig (self,
                                                         name,
diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
index d1d679b2..2fb0f04e 100644
--- a/src/libostree/ostree-repo-refs.c
+++ b/src/libostree/ostree-repo-refs.c
@@ -449,7 +449,7 @@ _ostree_repo_resolve_rev_internal (OstreeRepo     *self,
  * @self: Repo
  * @refspec: A refspec
  * @allow_noent: Do not throw an error if refspec does not exist
- * @out_rev: (out) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
+ * @out_rev: (out) (nullable) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
  * @error: Error
  *
  * Look up the given refspec, returning the checksum it references in
@@ -472,7 +472,7 @@ ostree_repo_resolve_rev (OstreeRepo     *self,
  * @refspec: A refspec
  * @allow_noent: Do not throw an error if refspec does not exist
  * @flags: Options controlling behavior
- * @out_rev: (out) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
+ * @out_rev: (out) (nullable) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
  * @error: Error
  *
  * Look up the given refspec, returning the checksum it references in
diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index 893ce2fa..0f0828f7 100644
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -636,7 +636,7 @@ try_content_rollsum (OstreeRepo                       *repo,
   if (!get_unpacked_unlinked_content (repo, to, &tmp_to, cancellable, error))
     return FALSE;
 
-  OstreeRollsumMatches *matches = _ostree_compute_rollsum_matches (tmp_from, tmp_to);
+  g_autoptr(OstreeRollsumMatches) matches = _ostree_compute_rollsum_matches (tmp_from, tmp_to);
 
   const guint match_ratio = (matches->bufmatches*100)/matches->total;
 
diff --git a/src/libostree/ostree-repo-verity.c b/src/libostree/ostree-repo-verity.c
new file mode 100644
index 00000000..92b026ee
--- /dev/null
+++ b/src/libostree/ostree-repo-verity.c
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.0+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include 
+
+#include "ostree-core-private.h"
+#include "ostree-repo-private.h"
+#include "otutil.h"
+#include "ot-fs-utils.h"
+#ifdef HAVE_LINUX_FSVERITY_H
+#include 
+#endif
+
+gboolean 
+_ostree_repo_parse_fsverity_config (OstreeRepo *self, GError **error)
+{
+  /* Currently experimental */
+  static const char fsverity_key[] = "ex-fsverity";
+  self->fs_verity_wanted = _OSTREE_FEATURE_NO;
+#ifdef HAVE_LINUX_FSVERITY_H
+  self->fs_verity_supported = _OSTREE_FEATURE_MAYBE;
+#else
+  self->fs_verity_supported = _OSTREE_FEATURE_NO;
+#endif
+  gboolean fsverity_required = FALSE;
+  if (!ot_keyfile_get_boolean_with_default (self->config, fsverity_key, "required",
+                                            FALSE, &fsverity_required, error))
+    return FALSE;
+  if (fsverity_required)
+    {
+      self->fs_verity_wanted = _OSTREE_FEATURE_YES;
+      if (self->fs_verity_supported == _OSTREE_FEATURE_NO)
+        return glnx_throw (error, "fsverity required, but libostree compiled without support");
+    }
+  else
+    {  
+      gboolean fsverity_opportunistic = FALSE;
+      if (!ot_keyfile_get_boolean_with_default (self->config, fsverity_key, "opportunistic",
+                                                FALSE, &fsverity_opportunistic, error))
+        return FALSE;
+      if (fsverity_opportunistic)
+        self->fs_verity_wanted = _OSTREE_FEATURE_MAYBE;
+    }
+
+  return TRUE;
+}
+
+
+/* Wrapper around the fsverity ioctl, compressing the result to
+ * "success, unsupported or error".  This is used for /boot where
+ * we enable verity if supported.
+ * */
+gboolean
+_ostree_tmpf_fsverity_core (GLnxTmpfile *tmpf,
+                            _OstreeFeatureSupport fsverity_requested,
+                            gboolean    *supported,
+                            GError     **error)
+{
+  /* Set this by default to simplify the code below */
+  if (supported)
+    *supported = FALSE;
+
+  if (fsverity_requested == _OSTREE_FEATURE_NO)
+    return TRUE;
+
+#ifdef HAVE_LINUX_FSVERITY_H
+  GLNX_AUTO_PREFIX_ERROR ("fsverity", error);
+
+  /* fs-verity requires a read-only file descriptor */
+  if (!glnx_tmpfile_reopen_rdonly (tmpf, error))
+    return FALSE;
+
+  struct fsverity_enable_arg arg = { 0, };
+  arg.version = 1;
+  arg.hash_algorithm =  FS_VERITY_HASH_ALG_SHA256;  /* TODO configurable? */
+  arg.block_size = 4096; /* FIXME query */
+  arg.salt_size = 0; /* TODO store salt in ostree repo config */
+  arg.salt_ptr = 0;
+  arg.sig_size = 0; /* We don't currently expect use of in-kernel signature verification */
+  arg.sig_ptr = 0;
+
+  if (ioctl (tmpf->fd, FS_IOC_ENABLE_VERITY, &arg) < 0)
+    {
+      switch (errno)
+        {
+          case ENOTTY:
+          case EOPNOTSUPP:
+            return TRUE;
+          default:
+            return glnx_throw_errno_prefix (error, "ioctl(FS_IOC_ENABLE_VERITY)");
+        }
+    }
+  
+  if (supported)
+    *supported = TRUE;
+#endif
+  return TRUE;
+}
+
+/* Enable verity on a file, respecting the "wanted" and "supported" states.
+ * The main idea here is to optimize out pointlessly calling the ioctl()
+ * over and over in cases where it's not supported for the repo's filesystem,
+ * as well as to support "opportunistic" use (requested and if filesystem supports).
+ * */
+gboolean
+_ostree_tmpf_fsverity (OstreeRepo  *self,
+                       GLnxTmpfile *tmpf,
+                       GError    **error)
+{
+#ifdef HAVE_LINUX_FSVERITY_H
+  g_mutex_lock (&self->txn_lock);
+  _OstreeFeatureSupport fsverity_wanted = self->fs_verity_wanted;
+  _OstreeFeatureSupport fsverity_supported = self->fs_verity_supported;
+  g_mutex_unlock (&self->txn_lock);
+
+  switch (fsverity_wanted)
+    {
+      case _OSTREE_FEATURE_YES:
+        {
+          if (fsverity_supported == _OSTREE_FEATURE_NO)
+            return glnx_throw (error, "fsverity required but filesystem does not support it");
+        }
+        break;
+      case _OSTREE_FEATURE_MAYBE:
+        break;
+      case _OSTREE_FEATURE_NO:
+        return TRUE;
+    }
+
+  gboolean supported = FALSE;
+  if (!_ostree_tmpf_fsverity_core (tmpf, fsverity_wanted, &supported, error))
+    return FALSE;
+
+  if (!supported)
+    {
+      if (G_UNLIKELY (fsverity_wanted == _OSTREE_FEATURE_YES))
+        return glnx_throw (error, "fsverity required but filesystem does not support it");
+
+      /* If we got here, we must be trying "opportunistic" use of fs-verity */
+      g_assert_cmpint (fsverity_wanted, ==, _OSTREE_FEATURE_MAYBE);
+      g_mutex_lock (&self->txn_lock);
+      self->fs_verity_supported = _OSTREE_FEATURE_NO;
+      g_mutex_unlock (&self->txn_lock);
+      return TRUE;
+    }
+  
+  g_mutex_lock (&self->txn_lock);
+  self->fs_verity_supported = _OSTREE_FEATURE_YES;
+  g_mutex_unlock (&self->txn_lock);
+#else
+  g_assert_cmpint (self->fs_verity_wanted, !=, _OSTREE_FEATURE_YES);
+#endif
+  return TRUE;
+}
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 1c951b12..0c045c41 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2584,7 +2584,7 @@ ostree_repo_create (OstreeRepo     *self,
  * @dfd: Directory fd
  * @path: Path
  * @mode: The mode to store the repository in
- * @options: a{sv}: See below for accepted keys
+ * @options: (nullable): a{sv}: See below for accepted keys
  * @cancellable: Cancellable
  * @error: Error
  *
@@ -3017,33 +3017,8 @@ reload_core_config (OstreeRepo          *self,
       }
   }
 
-  /* Currently experimental */
-  static const char fsverity_key[] = "ex-fsverity";
-  self->fs_verity_wanted = _OSTREE_FEATURE_NO;
-#ifdef HAVE_LINUX_FSVERITY_H
-  self->fs_verity_supported = _OSTREE_FEATURE_MAYBE;
-#else
-  self->fs_verity_supported = _OSTREE_FEATURE_NO;
-#endif
-  gboolean fsverity_required = FALSE;
-  if (!ot_keyfile_get_boolean_with_default (self->config, fsverity_key, "required",
-                                            FALSE, &fsverity_required, error))
+  if (!_ostree_repo_parse_fsverity_config (self, error))
     return FALSE;
-  if (fsverity_required)
-    {
-      self->fs_verity_wanted = _OSTREE_FEATURE_YES;
-      if (self->fs_verity_supported == _OSTREE_FEATURE_NO)
-        return glnx_throw (error, "fsverity required, but libostree compiled without support");
-    }
-  else
-    {  
-      gboolean fsverity_opportunistic = FALSE;
-      if (!ot_keyfile_get_boolean_with_default (self->config, fsverity_key, "opportunistic",
-                                                FALSE, &fsverity_opportunistic, error))
-        return FALSE;
-      if (fsverity_opportunistic)
-        self->fs_verity_wanted = _OSTREE_FEATURE_MAYBE;
-    }
   
   {
     g_clear_pointer (&self->collection_id, g_free);
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 900efe49..32748a62 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -56,9 +56,6 @@
 #define OSTREE_DEPLOYMENT_FINALIZING_ID SD_ID128_MAKE(e8,64,6c,d6,3d,ff,46,25,b7,79,09,a8,e7,a4,09,94)
 #endif
 
-static gboolean
-is_ro_mount (const char *path);
-
 /*
  * Like symlinkat() but overwrites (atomically) an existing
  * symlink.
@@ -1582,11 +1579,11 @@ full_system_sync (OstreeSysroot     *self,
 
   out_stats->root_syncfs_msec = (end_msec - start_msec);
 
-  start_msec = g_get_monotonic_time () / 1000;
-  glnx_autofd int boot_dfd = -1;
-  if (!glnx_opendirat (self->sysroot_fd, "boot", TRUE, &boot_dfd, error))
+  if (!_ostree_sysroot_ensure_boot_fd  (self, error))
     return FALSE;
-  if (!fsfreeze_thaw_cycle (self, boot_dfd, cancellable, error))
+
+  start_msec = g_get_monotonic_time () / 1000;
+  if (!fsfreeze_thaw_cycle (self, self->boot_fd, cancellable, error))
     return FALSE;
   end_msec = g_get_monotonic_time () / 1000;
   out_stats->boot_syncfs_msec = (end_msec - start_msec);
@@ -1678,6 +1675,7 @@ static gboolean
 swap_bootlinks (OstreeSysroot *self,
                 int            bootversion,
                 GPtrArray     *new_deployments,
+                char         **out_subbootdir,
                 GCancellable  *cancellable,
                 GError       **error)
 {
@@ -1702,7 +1700,8 @@ swap_bootlinks (OstreeSysroot *self,
   if (!symlink_at_replace (ostree_subbootdir_name, ostree_dfd, ostree_bootdir_name,
                            cancellable, error))
     return FALSE;
-
+  if (out_subbootdir)
+    *out_subbootdir = g_steal_pointer (&ostree_subbootdir_name);
   return TRUE;
 }
 
@@ -1770,8 +1769,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
                              cancellable, error))
     return FALSE;
 
-  glnx_autofd int boot_dfd = -1;
-  if (!glnx_opendirat (sysroot->sysroot_fd, "boot", TRUE, &boot_dfd, error))
+  if (!_ostree_sysroot_ensure_boot_fd  (sysroot, error))
     return FALSE;
 
   const char *osname = ostree_deployment_get_osname (deployment);
@@ -1781,14 +1779,14 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
   g_autofree char *bootconf_name = g_strdup_printf ("ostree-%d-%s.conf",
                                    n_deployments - ostree_deployment_get_index (deployment),
                                    osname);
-  if (!glnx_shutil_mkdir_p_at (boot_dfd, bootcsumdir, 0775, cancellable, error))
+  if (!glnx_shutil_mkdir_p_at (sysroot->boot_fd, bootcsumdir, 0775, cancellable, error))
     return FALSE;
 
   glnx_autofd int bootcsum_dfd = -1;
-  if (!glnx_opendirat (boot_dfd, bootcsumdir, TRUE, &bootcsum_dfd, error))
+  if (!glnx_opendirat (sysroot->boot_fd, bootcsumdir, TRUE, &bootcsum_dfd, error))
     return FALSE;
 
-  if (!glnx_shutil_mkdir_p_at (boot_dfd, bootconfdir, 0775, cancellable, error))
+  if (!glnx_shutil_mkdir_p_at (sysroot->boot_fd, bootconfdir, 0775, cancellable, error))
     return FALSE;
 
   /* Install (hardlink/copy) the kernel into /boot/ostree/osname-${bootcsum} if
@@ -1879,18 +1877,18 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
         {
           overlay_initrds = g_ptr_array_new_with_free_func (g_free);
 
-          if (!glnx_shutil_mkdir_p_at (boot_dfd, _OSTREE_SYSROOT_BOOT_INITRAMFS_OVERLAYS,
+          if (!glnx_shutil_mkdir_p_at (sysroot->boot_fd, _OSTREE_SYSROOT_BOOT_INITRAMFS_OVERLAYS,
                                        0755, cancellable, error))
             return FALSE;
         }
 
-      if (!glnx_fstatat_allow_noent (boot_dfd, rel_destpath, NULL, 0, error))
+      if (!glnx_fstatat_allow_noent (sysroot->boot_fd, rel_destpath, NULL, 0, error))
         return FALSE;
       if (errno == ENOENT)
         {
           g_autofree char *srcpath =
             g_strdup_printf (_OSTREE_SYSROOT_RUNSTATE_STAGED_INITRDS_DIR "/%s", checksum);
-          if (!install_into_boot (repo, sepolicy, AT_FDCWD, srcpath, boot_dfd, rel_destpath,
+          if (!install_into_boot (repo, sepolicy, AT_FDCWD, srcpath, sysroot->boot_fd, rel_destpath,
                                   cancellable, error))
             return FALSE;
         }
@@ -2019,7 +2017,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
   ostree_bootconfig_parser_set (bootconfig, "options", options_key);
 
   glnx_autofd int bootconf_dfd = -1;
-  if (!glnx_opendirat (boot_dfd, bootconfdir, TRUE, &bootconf_dfd, error))
+  if (!glnx_opendirat (sysroot->boot_fd, bootconfdir, TRUE, &bootconf_dfd, error))
     return FALSE;
 
   if (!ostree_bootconfig_parser_write_at (ostree_deployment_get_bootconfig (deployment),
@@ -2076,15 +2074,14 @@ swap_bootloader (OstreeSysroot  *sysroot,
   g_assert ((current_bootversion == 0 && new_bootversion == 1) ||
             (current_bootversion == 1 && new_bootversion == 0));
 
-  glnx_autofd int boot_dfd = -1;
-  if (!glnx_opendirat (sysroot->sysroot_fd, "boot", TRUE, &boot_dfd, error))
+  if (!_ostree_sysroot_ensure_boot_fd  (sysroot, error))
     return FALSE;
 
   /* The symlink was already written, and we used syncfs() to ensure
    * its data is in place.  Renaming now should give us atomic semantics;
    * see https://bugzilla.gnome.org/show_bug.cgi?id=755595
    */
-  if (!glnx_renameat (boot_dfd, "loader.tmp", boot_dfd, "loader", error))
+  if (!glnx_renameat (sysroot->boot_fd, "loader.tmp", sysroot->boot_fd, "loader", error))
     return FALSE;
 
   /* Now we explicitly fsync this directory, even though it
@@ -2096,7 +2093,7 @@ swap_bootloader (OstreeSysroot  *sysroot,
    *    for whatever reason, and we wouldn't want to confuse the
    *    admin by going back to the previous session.
    */
-  if (fsync (boot_dfd) != 0)
+  if (fsync (sysroot->boot_fd) != 0)
     return glnx_throw_errno_prefix (error, "fsync(boot)");
 
   /* TODO: In the future also execute this automatically via a systemd unit
@@ -2227,57 +2224,6 @@ cleanup_legacy_current_symlinks (OstreeSysroot         *self,
   return TRUE;
 }
 
-/* Detect whether or not @path refers to a read-only mountpoint. This is
- * currently just used to handle a potentially read-only /boot by transiently
- * remounting it read-write. In the future we might also do this for e.g.
- * /sysroot.
- */
-static gboolean
-is_ro_mount (const char *path)
-{
-#ifdef HAVE_LIBMOUNT
-  /* Dragging in all of this crud is apparently necessary just to determine
-   * whether something is a mount point.
-   *
-   * Systemd has a totally different implementation in
-   * src/basic/mount-util.c.
-   */
-  struct libmnt_table *tb = mnt_new_table_from_file ("/proc/self/mountinfo");
-  struct libmnt_fs *fs;
-  struct libmnt_cache *cache;
-  gboolean is_mount = FALSE;
-  struct statvfs stvfsbuf;
-
-  if (!tb)
-    return FALSE;
-
-  /* to canonicalize all necessary paths */
-  cache = mnt_new_cache ();
-  mnt_table_set_cache (tb, cache);
-
-  fs = mnt_table_find_target(tb, path, MNT_ITER_BACKWARD);
-  is_mount = fs && mnt_fs_get_target (fs);
-#ifdef HAVE_MNT_UNREF_CACHE
-  mnt_unref_table (tb);
-  mnt_unref_cache (cache);
-#else
-  mnt_free_table (tb);
-  mnt_free_cache (cache);
-#endif
-
-  if (!is_mount)
-    return FALSE;
-
-  /* We *could* parse the options, but it seems more reliable to
-   * introspect the actual mount at runtime.
-   */
-  if (statvfs (path, &stvfsbuf) == 0)
-    return (stvfsbuf.f_flag & ST_RDONLY) != 0;
-
-#endif
-  return FALSE;
-}
-
 /**
  * ostree_sysroot_write_deployments:
  * @self: Sysroot
@@ -2309,6 +2255,7 @@ write_deployments_bootswap (OstreeSysroot     *self,
                             OstreeSysrootWriteDeploymentsOpts *opts,
                             OstreeBootloader  *bootloader,
                             SyncStats         *out_syncstats,
+                            char             **out_subbootdir,
                             GCancellable      *cancellable,
                             GError           **error)
 {
@@ -2356,7 +2303,8 @@ write_deployments_bootswap (OstreeSysroot     *self,
                              new_deployments,
                              cancellable, error))
     return FALSE;
-  if (!swap_bootlinks (self, new_bootversion, new_deployments,
+  g_autofree char *new_subbootdir = NULL;
+  if (!swap_bootlinks (self, new_bootversion, new_deployments, &new_subbootdir,
                        cancellable, error))
     return FALSE;
 
@@ -2382,6 +2330,8 @@ write_deployments_bootswap (OstreeSysroot     *self,
                         cancellable, error))
     return FALSE;
 
+  if (out_subbootdir)
+    *out_subbootdir = g_steal_pointer (&new_subbootdir);
   return TRUE;
 }
 
@@ -2560,6 +2510,7 @@ ostree_sysroot_write_deployments_with_options (OstreeSysroot     *self,
   gboolean bootloader_is_atomic = FALSE;
   SyncStats syncstats = { 0, };
   g_autoptr(OstreeBootloader) bootloader = NULL;
+  g_autofree char *new_subbootdir = NULL;
   if (!requires_new_bootversion)
     {
       if (!create_new_bootlinks (self, self->bootversion,
@@ -2571,7 +2522,7 @@ ostree_sysroot_write_deployments_with_options (OstreeSysroot     *self,
         return FALSE;
 
       if (!swap_bootlinks (self, self->bootversion,
-                           new_deployments,
+                           new_deployments, &new_subbootdir,
                            cancellable, error))
         return FALSE;
 
@@ -2579,49 +2530,21 @@ ostree_sysroot_write_deployments_with_options (OstreeSysroot     *self,
     }
   else
     {
-      gboolean boot_was_ro_mount = FALSE;
-      if (self->booted_deployment)
-        boot_was_ro_mount = is_ro_mount ("/boot");
-
-      g_debug ("boot is ro: %s", boot_was_ro_mount ? "yes" : "no");
-
-      if (boot_was_ro_mount)
-        {
-          if (mount ("/boot", "/boot", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)
-            return glnx_throw_errno_prefix (error, "Remounting /boot read-write");
-        }
-
       if (!_ostree_sysroot_query_bootloader (self, &bootloader, cancellable, error))
         return FALSE;
 
       bootloader_is_atomic = bootloader != NULL && _ostree_bootloader_is_atomic (bootloader);
 
-      /* Note equivalent of try/finally here */
-      gboolean success = write_deployments_bootswap (self, new_deployments, opts, bootloader,
-                                                     &syncstats, cancellable, error);
-      /* Below here don't set GError until the if (!success) check.
-       * Note we only bother remounting if a mount namespace isn't in use.
-       * */
-      if (boot_was_ro_mount && !self->mount_namespace_in_use)
-        {
-          if (mount ("/boot", "/boot", NULL, MS_REMOUNT | MS_RDONLY | MS_SILENT, NULL) < 0)
-            {
-              /* Only make this a warning because we don't want to
-               * completely bomb out if some other process happened to
-               * jump in and open a file there.  See above TODO
-               * around doing this in a new mount namespace.
-               */
-              g_printerr ("warning: Failed to remount /boot read-only: %s\n", strerror (errno));
-            }
-        }
-      if (!success)
+      if (!write_deployments_bootswap (self, new_deployments, opts, bootloader,
+                                       &syncstats, &new_subbootdir, cancellable, error))
         return FALSE;
     }
 
   { g_autofree char *msg =
-      g_strdup_printf ("%s; bootconfig swap: %s; deployment count change: %i",
+      g_strdup_printf ("%s; bootconfig swap: %s; bootversion: %s, deployment count change: %i",
                        (bootloader_is_atomic ? "Transaction complete" : "Bootloader updated"),
                        requires_new_bootversion ? "yes" : "no",
+                       new_subbootdir,
                        new_deployments->len - self->deployments->len);
     const gchar *bootloader_config = ostree_repo_get_bootloader (ostree_sysroot_repo (self));
     ot_journal_send ("MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(OSTREE_DEPLOYMENT_COMPLETE_ID),
@@ -3143,9 +3066,9 @@ ostree_sysroot_stage_tree_with_options (OstreeSysroot     *self,
   if (!_ostree_sysroot_ensure_writable (self, error))
     return FALSE;
 
-  OstreeDeployment *booted_deployment = ostree_sysroot_get_booted_deployment (self);
+  OstreeDeployment *booted_deployment = ostree_sysroot_require_booted_deployment (self, error);
   if (booted_deployment == NULL)
-    return glnx_throw (error, "Cannot stage a deployment when not currently booted into an OSTree system");
+    return glnx_prefix_error (error, "Cannot stage deployment");
 
   /* This is used by the testsuite to exercise the path unit, until it becomes the default
    * (which is pending on the preset making it everywhere). */
diff --git a/src/libostree/ostree-sysroot-private.h b/src/libostree/ostree-sysroot-private.h
index 318b0b19..641f0533 100644
--- a/src/libostree/ostree-sysroot-private.h
+++ b/src/libostree/ostree-sysroot-private.h
@@ -56,6 +56,7 @@ struct OstreeSysroot {
 
   GFile *path;
   int sysroot_fd;
+  int boot_fd;
   GLnxLockFile lock;
 
   OstreeSysrootLoadState loadstate;
@@ -160,6 +161,9 @@ char * _ostree_sysroot_get_runstate_path (OstreeDeployment *deployment, const ch
 
 char *_ostree_sysroot_join_lines (GPtrArray  *lines);
 
+gboolean
+_ostree_sysroot_ensure_boot_fd (OstreeSysroot *self, GError **error);
+
 gboolean _ostree_sysroot_query_bootloader (OstreeSysroot     *sysroot,
                                            OstreeBootloader **out_bootloader,
                                            GCancellable      *cancellable,
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index e3d7e425..b0ae66cf 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -198,6 +198,7 @@ ostree_sysroot_init (OstreeSysroot *self)
                                             keys, G_N_ELEMENTS (keys));
 
   self->sysroot_fd = -1;
+  self->boot_fd = -1;
 }
 
 /**
@@ -278,6 +279,44 @@ ensure_sysroot_fd (OstreeSysroot          *self,
                            &self->sysroot_fd, error))
         return FALSE;
     }
+
+  return TRUE;
+}
+
+gboolean
+_ostree_sysroot_ensure_boot_fd (OstreeSysroot *self, GError **error)
+{
+  if (self->boot_fd == -1)
+    {
+      if (!glnx_opendirat (self->sysroot_fd, "boot", TRUE,
+                           &self->boot_fd, error))
+        return FALSE;
+    }
+  return TRUE;
+}
+
+static gboolean
+remount_writable (const char *path, gboolean *did_remount, GError **error)
+{
+  *did_remount = FALSE;
+  struct statvfs stvfsbuf;
+  if (statvfs (path, &stvfsbuf) < 0)
+    {
+      if (errno != ENOENT)
+        return glnx_throw_errno_prefix (error, "statvfs(%s)", path);
+      else
+        return TRUE;
+    }
+
+  if ((stvfsbuf.f_flag & ST_RDONLY) != 0)
+    {
+      /* OK, let's remount writable. */
+      if (mount (path, path, NULL, MS_REMOUNT | MS_RELATIME, "") < 0)
+        return glnx_throw_errno_prefix (error, "Remounting %s read-write", path);
+      *did_remount = TRUE;
+      g_debug ("remounted %s writable", path);
+    }
+
   return TRUE;
 }
 
@@ -300,19 +339,19 @@ _ostree_sysroot_ensure_writable (OstreeSysroot      *self,
   if (!self->root_is_ostree_booted)
     return TRUE;
 
-  /* Check if /sysroot is a read-only mountpoint */
-  struct statvfs stvfsbuf;
-  if (statvfs ("/sysroot", &stvfsbuf) < 0)
-    return glnx_throw_errno_prefix (error, "fstatvfs(/sysroot)");
-  if ((stvfsbuf.f_flag & ST_RDONLY) == 0)
-    return TRUE;
+  /* In these cases we also require /boot */
+  if (!_ostree_sysroot_ensure_boot_fd (self, error))
+    return FALSE;
 
-  /* OK, let's remount writable. */
-  if (mount ("/sysroot", "/sysroot", NULL, MS_REMOUNT | MS_RELATIME, "") < 0)
-    return glnx_throw_errno_prefix (error, "Remounting /sysroot read-write");
+  gboolean did_remount_sysroot = FALSE;
+  if (!remount_writable ("/sysroot", &did_remount_sysroot, error))
+    return FALSE;
+  gboolean did_remount_boot = FALSE;
+  if (!remount_writable ("/boot", &did_remount_boot, error))
+    return FALSE;
 
-  /* Reopen our fd */
-  glnx_close_fd (&self->sysroot_fd);
+  /* Now close and reopen our file descriptors */
+  ostree_sysroot_unload (self);
   if (!ensure_sysroot_fd (self, error))
     return FALSE;
 
@@ -380,6 +419,7 @@ void
 ostree_sysroot_unload (OstreeSysroot  *self)
 {
   glnx_close_fd (&self->sysroot_fd);
+  glnx_close_fd (&self->boot_fd);
 }
 
 /**
@@ -449,6 +489,7 @@ _ostree_sysroot_parse_deploy_path_name (const char *name,
   return TRUE;
 }
 
+/* For a given bootversion, get its subbootversion from `/ostree/boot.$bootversion`. */
 gboolean
 _ostree_sysroot_read_current_subbootversion (OstreeSysroot *self,
                                              int            bootversion,
@@ -465,6 +506,7 @@ _ostree_sysroot_read_current_subbootversion (OstreeSysroot *self,
     return FALSE;
   if (errno == ENOENT)
     {
+      g_debug ("Didn't find $sysroot/ostree/boot.%d symlink; assuming subbootversion 0", bootversion);
       *out_subbootversion = 0;
     }
   else
@@ -516,6 +558,7 @@ compare_loader_configs_for_sorting (gconstpointer  a_pp,
   return compare_boot_loader_configs (a, b);
 }
 
+/* Read all the bootconfigs from `/boot/loader/`. */
 gboolean
 _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self,
                                           int            bootversion,
@@ -574,6 +617,7 @@ _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self,
   return TRUE;
 }
 
+/* Get the bootversion from the `/boot/loader` symlink. */
 static gboolean
 read_current_bootversion (OstreeSysroot *self,
                           int           *out_bootversion,
@@ -587,6 +631,7 @@ read_current_bootversion (OstreeSysroot *self,
     return FALSE;
   if (errno == ENOENT)
     {
+      g_debug ("Didn't find $sysroot/boot/loader symlink; assuming bootversion 0");
       ret_bootversion = 0;
     }
   else
@@ -698,7 +743,7 @@ parse_deployment (OstreeSysroot       *self,
     return FALSE;
 
   g_autofree char *errprefix =
-    g_strdup_printf ("Parsing deployment %i in stateroot '%s'", treebootserial, osname);
+    g_strdup_printf ("Parsing deployment %s in stateroot '%s'", boot_link, osname);
   GLNX_AUTO_PREFIX_ERROR(errprefix, error);
 
   const char *relative_boot_link = boot_link;
@@ -799,6 +844,8 @@ get_ostree_kernel_arg_from_config (OstreeBootconfigParser  *config)
   return NULL;
 }
 
+/* From a BLS config, use its ostree= karg to find the deployment it points to and add it to
+ * the inout_deployments array. */
 static gboolean
 list_deployments_process_one_boot_entry (OstreeSysroot               *self,
                                          OstreeBootconfigParser      *config,
@@ -1016,6 +1063,9 @@ _ostree_sysroot_reload_staged (OstreeSysroot *self,
   return TRUE;
 }
 
+/* Loads the current bootversion, subbootversion, and deplyments, starting from the
+ * bootloader configs which are the source of truth.
+ */
 static gboolean
 sysroot_load_from_bootloader_configs (OstreeSysroot  *self,
                                       GCancellable   *cancellable,
@@ -1196,6 +1246,27 @@ ostree_sysroot_get_booted_deployment (OstreeSysroot       *self)
   return self->booted_deployment;
 }
 
+
+/**
+ * ostree_sysroot_require_booted_deployment:
+ * @self: Sysroot
+ *
+ * Find the booted deployment, or return an error if not booted via OSTree.
+ *
+ * Returns: (transfer none) (not nullable): The currently booted deployment, or an error
+ * Since: 2021.1
+ */
+OstreeDeployment *
+ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error)
+{
+  g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL);
+
+  if (!self->booted_deployment)
+    return glnx_null_throw (error, "Not currently booted into an OSTree system");
+  return self->booted_deployment;
+}
+
+
 /**
  * ostree_sysroot_get_staged_deployment:
  * @self: Sysroot
diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h
index 3a3b6a77..036b81e8 100644
--- a/src/libostree/ostree-sysroot.h
+++ b/src/libostree/ostree-sysroot.h
@@ -85,6 +85,9 @@ GPtrArray *ostree_sysroot_get_deployments (OstreeSysroot  *self);
 _OSTREE_PUBLIC
 OstreeDeployment *ostree_sysroot_get_booted_deployment (OstreeSysroot *self);
 _OSTREE_PUBLIC
+OstreeDeployment *
+ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error);
+_OSTREE_PUBLIC
 OstreeDeployment *ostree_sysroot_get_staged_deployment (OstreeSysroot *self);
 
 _OSTREE_PUBLIC
diff --git a/src/libostree/ostree-version.h b/src/libostree/ostree-version.h
index 38dd0878..ce426ebc 100644
--- a/src/libostree/ostree-version.h
+++ b/src/libostree/ostree-version.h
@@ -34,7 +34,7 @@
  *
  * Since: 2017.4
  */
-#define OSTREE_YEAR_VERSION (2020)
+#define OSTREE_YEAR_VERSION (2021)
 
 /**
  * OSTREE_RELEASE_VERSION:
@@ -43,7 +43,7 @@
  *
  * Since: 2017.4
  */
-#define OSTREE_RELEASE_VERSION (8)
+#define OSTREE_RELEASE_VERSION (1)
 
 /**
  * OSTREE_VERSION
@@ -52,7 +52,7 @@
  *
  * Since: 2017.4
  */
-#define OSTREE_VERSION (2020.8)
+#define OSTREE_VERSION (2021.1)
 
 /**
  * OSTREE_VERSION_S:
@@ -62,7 +62,7 @@
  *
  * Since: 2017.4
  */
-#define OSTREE_VERSION_S "2020.8"
+#define OSTREE_VERSION_S "2021.1"
 
 #define OSTREE_ENCODE_VERSION(year,release) \
         ((year) << 16 | (release))
@@ -100,4 +100,4 @@
  *
  * Since: 2019.3
  */
-#define OSTREE_BUILT_FEATURES "libsoup gpgme ex-fsverity libarchive selinux avahi libmount systemd release p2p"
+#define OSTREE_BUILT_FEATURES "libsoup gpgme ex-fsverity libarchive selinux libmount systemd release p2p"
diff --git a/src/libostree/ostree.h b/src/libostree/ostree.h
index 0308d0ed..e4847dbe 100644
--- a/src/libostree/ostree.h
+++ b/src/libostree/ostree.h
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h
index 7db7270d..4cc5cd9f 100644
--- a/src/libotutil/otutil.h
+++ b/src/libotutil/otutil.h
@@ -34,6 +34,12 @@
 #define OT_VARIANT_BUILDER_INITIALIZER {{{0,}}}
 #endif
 
+static inline const char *
+ot_booltostr (int b)
+{
+  return b ? "true" : "false";
+}
+
 #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)
 
 #define ot_transfer_out_value(outp, srcp) G_STMT_START {   \
diff --git a/src/ostree/ot-admin-builtin-set-origin.c b/src/ostree/ot-admin-builtin-set-origin.c
index 4dc68a00..b133dc58 100644
--- a/src/ostree/ot-admin-builtin-set-origin.c
+++ b/src/ostree/ot-admin-builtin-set-origin.c
@@ -75,13 +75,9 @@ ot_admin_builtin_set_origin (int argc, char **argv, OstreeCommandInvocation *inv
 
   if (opt_index == -1)
     {
-      target_deployment = ostree_sysroot_get_booted_deployment (sysroot);
+      target_deployment = ostree_sysroot_require_booted_deployment (sysroot, error);
       if (target_deployment == NULL)
-        {
-          g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                               "Not currently booted into an OSTree system");
-          goto out;
-        }
+        goto out;
       /* To match the below */
       target_deployment = g_object_ref (target_deployment);
     }
diff --git a/src/ostree/ot-admin-builtin-unlock.c b/src/ostree/ot-admin-builtin-unlock.c
index 6c265f54..77fe8be3 100644
--- a/src/ostree/ot-admin-builtin-unlock.c
+++ b/src/ostree/ot-admin-builtin-unlock.c
@@ -61,13 +61,9 @@ ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocat
       goto out;
     }
 
-  booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
+  booted_deployment = ostree_sysroot_require_booted_deployment (sysroot, error);
   if (!booted_deployment)
-    {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                           "Not currently booted into an OSTree system");
-      goto out;
-    }
+    goto out;
 
   if (opt_hotfix && opt_transient)
     {
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index 48fa2928..7a23741e 100644
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -35,6 +35,7 @@
 
 static char *opt_subject;
 static char *opt_body;
+static char *opt_bootable;
 static char *opt_body_file;
 static gboolean opt_editor;
 static char *opt_parent;
@@ -112,6 +113,7 @@ static GOptionEntry options[] = {
   { "owner-uid", 0, 0, G_OPTION_ARG_INT, &opt_owner_uid, "Set file ownership user id", "UID" },
   { "owner-gid", 0, 0, G_OPTION_ARG_INT, &opt_owner_gid, "Set file ownership group id", "GID" },
   { "canonical-permissions", 0, 0, G_OPTION_ARG_NONE, &opt_canonical_permissions, "Canonicalize permissions in the same way bare-user does for hardlinked files", NULL },
+  { "bootable", 0, 0, G_OPTION_ARG_NONE, &opt_bootable, "Flag this commit as a bootable OSTree (e.g. contains a Linux kernel)", NULL },
   { "mode-ro-executables", 0, 0, G_OPTION_ARG_NONE, &opt_ro_executables, "Ensure executable files are not writable", NULL },
   { "no-xattrs", 0, 0, G_OPTION_ARG_NONE, &opt_no_xattrs, "Do not import extended attributes", NULL },
   { "selinux-policy", 0, 0, G_OPTION_ARG_FILENAME, &opt_selinux_policy, "Set SELinux labels based on policy in root filesystem PATH (may be /)", "PATH" },
@@ -501,7 +503,7 @@ ostree_builtin_commit (int argc, char **argv, OstreeCommandInvocation *invocatio
       goto out;
     }
 
-  if (opt_metadata_strings || opt_metadata_variants || opt_metadata_keep)
+  if (opt_metadata_strings || opt_metadata_variants || opt_metadata_keep || opt_bootable)
     {
       g_autoptr(GVariantBuilder) builder =
         g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
@@ -841,6 +843,17 @@ ostree_builtin_commit (int argc, char **argv, OstreeCommandInvocation *invocatio
           fill_bindings (repo, old_metadata, &metadata);
         }
 
+      if (opt_bootable)
+        {
+          g_autoptr(GVariant) old_metadata = g_steal_pointer (&metadata);
+          g_auto(GVariantDict) bootmeta;
+          g_variant_dict_init (&bootmeta, old_metadata);
+          if (!ostree_commit_metadata_for_bootable (root, &bootmeta, cancellable, error))
+            goto out;
+
+          metadata = g_variant_ref_sink (g_variant_dict_end (&bootmeta));
+        }
+
       if (!opt_timestamp)
         {
           if (!ostree_repo_write_commit (repo, parent, opt_subject, commit_body, metadata,
diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index 43f4f255..1485b7d4 100644
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -40,6 +40,7 @@ static gboolean opt_bareuseronly_files;
 static gboolean opt_require_static_deltas;
 static gboolean opt_gpg_verify;
 static gboolean opt_gpg_verify_summary;
+static gboolean opt_disable_verify_bindings;
 static int opt_depth = 0;
 
 /* ATTENTION:
@@ -57,6 +58,7 @@ static GOptionEntry options[] = {
   { "require-static-deltas", 0, 0, G_OPTION_ARG_NONE, &opt_require_static_deltas, "Require static deltas", NULL },
   { "gpg-verify", 0, 0, G_OPTION_ARG_NONE, &opt_gpg_verify, "GPG verify commits (must specify --remote)", NULL },
   { "gpg-verify-summary", 0, 0, G_OPTION_ARG_NONE, &opt_gpg_verify_summary, "GPG verify summary (must specify --remote)", NULL },
+  { "disable-verify-bindings", 0, 0, G_OPTION_ARG_NONE, &opt_disable_verify_bindings, "Do not verify commit bindings", NULL },
   { "depth", 0, 0, G_OPTION_ARG_INT, &opt_depth, "Traverse DEPTH parents (-1=infinite) (default: 0)", "DEPTH" },
   { NULL }
 };
@@ -181,6 +183,8 @@ ostree_builtin_pull_local (int argc, char **argv, OstreeCommandInvocation *invoc
     if (opt_gpg_verify_summary)
       g_variant_builder_add (&builder, "{s@v}", "gpg-verify-summary",
                              g_variant_new_variant (g_variant_new_boolean (TRUE)));
+    g_variant_builder_add (&builder, "{s@v}", "disable-verify-bindings",
+                           g_variant_new_variant (g_variant_new_boolean (opt_disable_verify_bindings)));
     g_variant_builder_add (&builder, "{s@v}", "depth",
                            g_variant_new_variant (g_variant_new_int32 (opt_depth)));
     /* local pulls always disable signapi verification.  If you don't want this, use
diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c
index ed0ec556..df3a8d39 100644
--- a/src/ostree/ot-builtin-pull.c
+++ b/src/ostree/ot-builtin-pull.c
@@ -38,6 +38,7 @@ static gboolean opt_require_static_deltas;
 static gboolean opt_untrusted;
 static gboolean opt_http_trusted;
 static gboolean opt_timestamp_check;
+static gboolean opt_disable_verify_bindings;
 static char* opt_timestamp_check_from_rev;
 static gboolean opt_bareuseronly_files;
 static char** opt_subpaths;
@@ -76,6 +77,7 @@ static GOptionEntry options[] = {
    { "localcache-repo", 'L', 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_localcache_repos, "Add REPO as local cache source for objects during this pull", "REPO" },
    { "timestamp-check", 'T', 0, G_OPTION_ARG_NONE, &opt_timestamp_check, "Require fetched commits to have newer timestamps", NULL },
    { "timestamp-check-from-rev", 0, 0, G_OPTION_ARG_STRING, &opt_timestamp_check_from_rev, "Require fetched commits to have newer timestamps than given rev", NULL },
+   { "disable-verify-bindings", 0, 0, G_OPTION_ARG_NONE, &opt_disable_verify_bindings, "Do not verify commit bindings", NULL },
    /* let's leave this hidden for now; we just need it for tests */
    { "append-user-agent", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &opt_append_user_agent, "Append string to user agent", NULL },
    { NULL }
@@ -330,6 +332,8 @@ ostree_builtin_pull (int argc, char **argv, OstreeCommandInvocation *invocation,
     if (opt_per_object_fsync)
       g_variant_builder_add (&builder, "{s@v}", "per-object-fsync",
                              g_variant_new_variant (g_variant_new_boolean (TRUE)));
+    g_variant_builder_add (&builder, "{s@v}", "disable-verify-bindings",
+                           g_variant_new_variant (g_variant_new_boolean (opt_disable_verify_bindings)));
     if (opt_http_headers)
       {
         GVariantBuilder hdr_builder;
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index bffa40c4..d153dcec 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -122,26 +122,10 @@ maybe_setup_mount_namespace (gboolean    *out_ns,
   if (errno == ENOENT)
     return TRUE;
 
-  glnx_autofd int sysroot_subdir_fd = glnx_opendirat_with_errno (AT_FDCWD, "/sysroot", TRUE);
-  if (sysroot_subdir_fd < 0)
-    {
-      if (errno != ENOENT)
-        return glnx_throw_errno_prefix (error, "opendirat");
-      /* No /sysroot - nothing to do */
-      return TRUE;
-    }
-
-  struct statvfs stvfs;
-  if (fstatvfs (sysroot_subdir_fd, &stvfs) < 0)
-    return glnx_throw_errno_prefix (error, "fstatvfs");
-  if (stvfs.f_flag & ST_RDONLY)
-    {
-      if (unshare (CLONE_NEWNS) < 0)
-        return glnx_throw_errno_prefix (error, "preparing writable sysroot: unshare (CLONE_NEWNS)");
-
-      *out_ns = TRUE;
-    }
+  if (unshare (CLONE_NEWNS) < 0)
+    return glnx_throw_errno_prefix (error, "setting up mount namespace: unshare(CLONE_NEWNS)");
 
+  *out_ns = TRUE;
   return TRUE;
 }
 
diff --git a/tests/admin-test.sh b/tests/admin-test.sh
index 3aab74cc..a7016a87 100644
--- a/tests/admin-test.sh
+++ b/tests/admin-test.sh
@@ -65,6 +65,12 @@ assert_not_file_has_content status.txt "pending"
 assert_not_file_has_content status.txt "rollback"
 validate_bootloader
 
+# Test the bootable and linux keys
+${CMD_PREFIX} ostree --repo=sysroot/ostree/repo --print-metadata-key=ostree.linux show testos:testos/buildmaster/x86_64-runtime >out.txt
+assert_file_has_content_literal out.txt 3.6.0
+${CMD_PREFIX} ostree --repo=sysroot/ostree/repo --print-metadata-key=ostree.bootable show testos:testos/buildmaster/x86_64-runtime >out.txt
+assert_file_has_content_literal out.txt true
+
 echo "ok deploy command"
 
 ${CMD_PREFIX} ostree admin --print-current-dir > curdir
@@ -89,7 +95,7 @@ echo "ok layout"
 if ${CMD_PREFIX} ostree admin deploy --stage --os=testos testos:testos/buildmaster/x86_64-runtime 2>err.txt; then
     fatal "staged when not booted"
 fi
-assert_file_has_content_literal err.txt "Cannot stage a deployment when not currently booted into an OSTree system"
+assert_file_has_content_literal err.txt "Cannot stage deployment: Not currently booted into an OSTree system"
 echo "ok staging does not work when not booted"
 
 orig_mtime=$(stat -c '%.Y' sysroot/ostree/deploy)
diff --git a/tests/basic-test.sh b/tests/basic-test.sh
index 9227b0cd..75333f4d 100644
--- a/tests/basic-test.sh
+++ b/tests/basic-test.sh
@@ -21,7 +21,7 @@
 
 set -euo pipefail
 
-echo "1..$((86 + ${extra_basic_tests:-0}))"
+echo "1..$((87 + ${extra_basic_tests:-0}))"
 
 CHECKOUT_U_ARG=""
 CHECKOUT_H_ARGS="-H"
@@ -226,6 +226,13 @@ $OSTREE commit ${COMMIT_ARGS} -b test2-no-parent -s '' --parent=none $test_tmpdi
 assert_streq $($OSTREE log test2-no-parent |grep '^commit' | wc -l) "1"
 echo "ok commit no parent"
 
+cd ${test_tmpdir}
+if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then
+    fatal "committed non-bootable tree"
+fi
+assert_file_has_content err.txt "error: .*No such file or directory"
+echo "ok commit fails bootable if no kernel"
+
 cd ${test_tmpdir}
 # Do the --bind-ref=, so we store both branches sorted
 # in metadata and thus the checksums remain the same.
diff --git a/tests/libtest.sh b/tests/libtest.sh
index 7c66a5c6..ffb05c7b 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -147,6 +147,9 @@ fi
 
 # This is substituted by the build for installed tests
 BUILT_WITH_ASAN=""
+if test -n "${ASAN_OPTIONS:-}"; then
+    BUILT_WITH_ASAN=1
+fi
 
 if test -n "${OT_TESTS_VALGRIND:-}"; then
     CMD_PREFIX="env G_SLICE=always-malloc OSTREE_SUPPRESS_SYNCFS=1 valgrind -q --error-exitcode=1 --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/glib.supp --suppressions=${test_srcdir}/ostree.supp"
@@ -412,11 +415,14 @@ setup_os_repository () {
     echo "an hmac file" > ${hmac_path}
     bootcsum=$(cat ${kernel_path} ${initramfs_path} | sha256sum | cut -f 1 -d ' ')
     export bootcsum
+    bootable_flag=""
     # Add the checksum for legacy dirs (/boot, /usr/lib/ostree-boot), but not
     # /usr/lib/modules.
     if [[ $bootdir != usr/lib/modules/* ]]; then
         mv ${kernel_path}{,-${bootcsum}}
         mv ${initramfs_path}{,-${bootcsum}}
+    else
+        bootable_flag="--bootable"
     fi
 
     echo "an executable" > usr/bin/sh
@@ -436,12 +442,12 @@ EOF
     mkdir -p usr/etc/testdirectory
     echo "a default daemon file" > usr/etc/testdirectory/test
 
-    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.9 -b testos/buildmaster/x86_64-runtime -s "Build"
+    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.9 -b testos/buildmaster/x86_64-runtime -s "Build"
 
     # Ensure these commits have distinct second timestamps
     sleep 2
     echo "a new executable" > usr/bin/sh
-    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build"
+    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build"
 
     cd ${test_tmpdir}
     rm -rf osdata-devel
@@ -450,7 +456,7 @@ EOF
     cd osdata-devel
     mkdir -p usr/include
     echo "a development header" > usr/include/foo.h
-    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.9 -b testos/buildmaster/x86_64-devel -s "Build"
+    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.9 -b testos/buildmaster/x86_64-devel -s "Build"
 
     ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo fsck -q
 
diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
index d3429cd6..75b298bc 100644
--- a/tests/test-libarchive-import.c
+++ b/tests/test-libarchive-import.c
@@ -95,6 +95,9 @@ test_data_init (TestData *td)
   archive_entry_set_uid (ae, uid);
   archive_entry_set_gid (ae, gid);
   archive_entry_set_size (ae, 4);
+  archive_entry_xattr_add_entry (ae, "user.a_key", "my value", 8);
+  archive_entry_xattr_add_entry (ae, "user.key2", "", 0);
+  archive_entry_xattr_add_entry (ae, "user.b_key", "contains\0nuls", 14);
   g_assert_cmpint (0, ==, archive_write_header (a, ae));
   g_assert_cmpint (4, ==, archive_write_data (a, "bar\n", 4));
   archive_entry_free (ae);
@@ -453,6 +456,90 @@ test_libarchive_xattr_callback (gconstpointer data)
   g_assert_no_error (error);
 }
 
+static void
+test_libarchive_xattr_import (gconstpointer data)
+{
+  TestData *td = (void*)data;
+  GError *error = NULL;
+  g_autoptr(OtAutoArchiveRead) a = archive_read_new ();
+  OstreeRepoImportArchiveOptions opts = { 0 };
+  char buf[15] = { 0 };
+
+  if (skip_if_no_xattr (td))
+    goto out;
+
+  if (td->skip_all != NULL)
+    {
+      g_test_skip (td->skip_all->message);
+      goto out;
+    }
+
+  test_archive_setup (td->fd, a);
+
+  opts.ignore_unsupported_content = TRUE;
+
+  if (!import_write_and_ref (td->repo, &opts, a, "baz", NULL, &error))
+    goto out;
+
+  /* check contents */
+  if (!spawn_cmdline ("ostree --repo=repo checkout baz import-checkout", NULL))
+    goto out;
+
+  spawn_cmdline ("ostree --repo=repo ls -R -X baz", NULL);
+  spawn_cmdline ("attr -l import-checkout/anotherfile", NULL);
+
+  ssize_t x = getxattr ("import-checkout/anotherfile", "user.a_key", buf, sizeof buf - 1);
+  g_assert_cmpint (x, ==, 8);
+  g_assert_cmpstr (buf, ==, "my value");
+
+  x = getxattr ("import-checkout/anotherfile", "user.key2", buf, sizeof buf - 1);
+  g_assert_cmpint (x, ==, 0);
+
+  x = getxattr ("import-checkout/anotherfile", "user.b_key", buf, sizeof buf - 1);
+  g_assert_cmpint (x, ==, 14);
+  g_assert (memcmp(buf, "contains\0nuls", 14) == 0);
+
+ out:
+  g_assert_no_error (error);
+}
+
+static void
+test_libarchive_xattr_import_skip_xattr (gconstpointer data)
+{
+  TestData *td = (void*)data;
+  GError *error = NULL;
+  g_autoptr(OtAutoArchiveRead) a = archive_read_new ();
+  OstreeRepoImportArchiveOptions opts = { 0 };
+
+  if (skip_if_no_xattr (td))
+    goto out;
+
+  if (td->skip_all != NULL)
+    {
+      g_test_skip (td->skip_all->message);
+      goto out;
+    }
+
+  test_archive_setup (td->fd, a);
+
+  opts.ignore_unsupported_content = TRUE;
+
+  g_autoptr(OstreeRepoCommitModifier) modifier = ostree_repo_commit_modifier_new (
+      OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS, NULL, NULL, NULL);
+  if (!import_write_and_ref (td->repo, &opts, a, "baz", modifier, &error))
+    goto out;
+
+  /* check contents */
+  if (!spawn_cmdline ("ostree --repo=repo checkout baz import-checkout", NULL))
+    goto out;
+
+  ssize_t n_attrs = listxattr ("import-checkout/anotherfile", NULL, 0);
+  g_assert_cmpint (n_attrs, ==, 0);
+
+ out:
+  g_assert_no_error (error);
+}
+
 static GVariant*
 path_cb (OstreeRepo  *repo,
          const char  *path,
@@ -610,6 +697,8 @@ int main (int argc, char **argv)
   g_test_add_data_func ("/libarchive/error-device-file", &td, test_libarchive_error_device_file);
   g_test_add_data_func ("/libarchive/ignore-device-file", &td, test_libarchive_ignore_device_file);
   g_test_add_data_func ("/libarchive/ostree-convention", &td, test_libarchive_ostree_convention);
+  g_test_add_data_func ("/libarchive/xattr-import", &td, test_libarchive_xattr_import);
+  g_test_add_data_func ("/libarchive/xattr-import-skip-xattr", &td, test_libarchive_xattr_import_skip_xattr);
   g_test_add_data_func ("/libarchive/xattr-callback", &td, test_libarchive_xattr_callback);
   g_test_add_data_func ("/libarchive/no-use-entry-pathname", &td, test_libarchive_no_use_entry_pathname);
   g_test_add_data_func ("/libarchive/use-entry-pathname", &td, test_libarchive_use_entry_pathname);
diff --git a/tests/test-local-pull-depth.sh b/tests/test-local-pull-depth.sh
index 96b20b9c..80413bc9 100755
--- a/tests/test-local-pull-depth.sh
+++ b/tests/test-local-pull-depth.sh
@@ -25,7 +25,7 @@ set -euo pipefail
 
 setup_test_repository "archive"
 
-echo "1..1"
+echo "1..3"
 
 cd ${test_tmpdir}
 mkdir repo2
@@ -62,3 +62,35 @@ find repo2/state -name '*.commitpartial' | wc -l > commitpartialcount
 assert_file_has_content commitpartialcount "^0$"
 
 echo "ok local pull depth"
+
+# Check that pulling with depth != 0 succeeds with a missing parent
+# commit. Prune the remote to truncate the history.
+cd ${test_tmpdir}
+${CMD_PREFIX} ostree --repo=repo prune --refs-only --depth=0
+
+rm -rf repo2/refs/heads/* repo2/refs/remotes/* repo2/objects/*/*.commit
+${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=1 repo
+find repo/objects -name '*.commit' | wc -l > commitcount
+assert_file_has_content commitcount "^1$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
+
+rm -rf repo2/refs/heads/* repo2/refs/remotes/* repo2/objects/*/*.commit
+${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=-1 repo
+find repo/objects -name '*.commit' | wc -l > commitcount
+assert_file_has_content commitcount "^1$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
+
+echo "ok local pull depth missing parent"
+
+# Check that it errors if the ref head commit is missing.
+cd ${test_tmpdir}
+rm -f repo/objects/*/*.commit
+
+rm -rf repo2/refs/heads/* repo2/refs/remotes/* repo2/objects/*/*.commit
+if ${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=-1 repo; then
+    fatal "Local pull with depth -1 succeeded with missing HEAD commit"
+fi
+
+echo "ok local pull depth missing HEAD commit"
diff --git a/tests/test-pull-collections.sh b/tests/test-pull-collections.sh
index cd60ab21..6882e982 100755
--- a/tests/test-pull-collections.sh
+++ b/tests/test-pull-collections.sh
@@ -117,7 +117,7 @@ do_pull() {
     local branch=$3
     shift 3
 
-    if ${CMD_PREFIX} ostree "--repo=${repo}" pull "${remote_repo}-remote" "${branch}"
+    if ${CMD_PREFIX} ostree "--repo=${repo}" pull "$@" "${remote_repo}-remote" "${branch}"
     then return 0
     else return 1
     fi
@@ -129,7 +129,7 @@ do_local_pull() {
     local branch=$3
     shift 3
 
-    if ${CMD_PREFIX} ostree "--repo=${repo}" pull-local "${remote_repo}" "${branch}"
+    if ${CMD_PREFIX} ostree "--repo=${repo}" pull-local "$@" "${remote_repo}" "${branch}"
     then return 0
     else return 1
     fi
@@ -221,19 +221,23 @@ if do_pull local collection-repo badcref1
 then
     assert_not_reached "pulling a commit without collection ID from a repo with collection ID should fail"
 fi
+do_pull local collection-repo badcref1 --disable-verify-bindings
 if do_pull local collection-repo badcref2
 then
     assert_not_reached "pulling a commit with a mismatched collection ID from a repo with collection ID should fail"
 fi
+do_pull local collection-repo badcref2 --disable-verify-bindings
 if do_pull local collection-repo badcref3
 then
     assert_not_reached "pulling a commit with empty collection ID from repo with collection ID should fail"
 fi
+do_pull local collection-repo badcref3 --disable-verify-bindings
 do_pull local collection-repo goodcref1
 if do_pull local collection-repo badcref4
 then
     assert_not_reached "pulling a commit that was not requested from repo with collection ID should fail"
 fi
+do_pull local collection-repo badcref4 --disable-verify-bindings
 
 echo "ok 5 pull refs from remote repos"
 
@@ -243,19 +247,23 @@ if do_local_pull local collection-local-repo badclref1
 then
     assert_not_reached "pulling a commit without collection ID from a repo with collection ID should fail"
 fi
+do_local_pull local collection-local-repo badclref1 --disable-verify-bindings
 if do_local_pull local collection-local-repo badclref2
 then
     assert_not_reached "pulling a commit with a mismatched collection ID from a repo with collection ID should fail"
 fi
+do_local_pull local collection-local-repo badclref2 --disable-verify-bindings
 if do_local_pull local collection-local-repo badclref3
 then
     assert_not_reached "pulling a commit with empty collection ID from repo with collection ID should fail"
 fi
+do_local_pull local collection-local-repo badclref3 --disable-verify-bindings
 do_local_pull local collection-local-repo goodclref1
 if do_local_pull local collection-local-repo badclref4
 then
     assert_not_reached "pulling a commit that was not requested from repo with collection ID should fail"
 fi
+do_local_pull local collection-local-repo badclref4 --disable-verify-bindings
 
 echo "ok 6 pull refs from local repos"
 
diff --git a/tests/test-pull-depth.sh b/tests/test-pull-depth.sh
index 1206c6c4..8fb2f597 100755
--- a/tests/test-pull-depth.sh
+++ b/tests/test-pull-depth.sh
@@ -25,7 +25,7 @@ set -euo pipefail
 
 setup_fake_remote_repo1 "archive"
 
-echo '1..1'
+echo '1..3'
 
 cd ${test_tmpdir}
 mkdir repo
@@ -35,21 +35,63 @@ ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat
 ${CMD_PREFIX} ostree --repo=repo pull --depth=0 origin main
 find repo/objects -name '*.commit' | wc -l > commitcount
 assert_file_has_content commitcount "^1$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
 
 ${CMD_PREFIX} ostree --repo=repo pull --depth=0 origin main
 find repo/objects -name '*.commit' | wc -l > commitcount
 assert_file_has_content commitcount "^1$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
 
 ${CMD_PREFIX} ostree --repo=repo pull --depth=1 origin main
 find repo/objects -name '*.commit' | wc -l > commitcount
 assert_file_has_content commitcount "^2$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
 
 ${CMD_PREFIX} ostree --repo=repo pull --depth=1 origin main
 find repo/objects -name '*.commit' | wc -l > commitcount
 assert_file_has_content commitcount "^2$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
 
 ${CMD_PREFIX} ostree --repo=repo pull --depth=-1 origin main
 find repo/objects -name '*.commit' | wc -l > commitcount
 assert_file_has_content commitcount "^3$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
 
 echo "ok pull depth"
+
+# Check that pulling with depth != 0 succeeds with a missing parent
+# commit. Prune the remote to truncate the history.
+cd ${test_tmpdir}
+${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo prune --refs-only --depth=0
+
+rm -rf repo/refs/heads/* repo/refs/remotes/* repo/objects/*/*.commit
+${CMD_PREFIX} ostree --repo=repo pull --depth=1 origin main
+find repo/objects -name '*.commit' | wc -l > commitcount
+assert_file_has_content commitcount "^1$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
+
+rm -rf repo/refs/heads/* repo/refs/remotes/* repo/objects/*/*.commit
+${CMD_PREFIX} ostree --repo=repo pull --depth=-1 origin main
+find repo/objects -name '*.commit' | wc -l > commitcount
+assert_file_has_content commitcount "^1$"
+find repo/state -name '*.commitpartial' | wc -l > commitpartialcount
+assert_file_has_content commitpartialcount "^0$"
+
+echo "ok pull depth missing parent"
+
+# Check that it errors if the ref head commit is missing.
+cd ${test_tmpdir}
+rm -f ostree-srv/gnomerepo/objects/*/*.commit
+
+rm -rf repo/refs/heads/* repo/refs/remotes/* repo/objects/*/*.commit
+if ${CMD_PREFIX} ostree --repo=repo pull --depth=-1 origin main; then
+    fatal "Pull with depth -1 succeeded with missing HEAD commit"
+fi
+
+echo "ok pull depth missing HEAD commit"
diff --git a/tests/test-pull-summary-sigs.sh b/tests/test-pull-summary-sigs.sh
index 401e88c9..3819cbf3 100755
--- a/tests/test-pull-summary-sigs.sh
+++ b/tests/test-pull-summary-sigs.sh
@@ -175,6 +175,8 @@ cd ${test_tmpdir}
 # Reset to the old valid summary and pull to cache it
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
+touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
+touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
 repo_reinit
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
@@ -186,6 +188,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
 # summary signature since it was generated on the server between the
 # requests
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
+touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
 if ${OSTREE} --repo=repo pull origin main 2>err.txt; then
     assert_not_reached "Successful pull with old summary"
 fi
@@ -197,6 +200,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
 
 # Publish correct summary and check that subsequent pull succeeds
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
+touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
 assert_has_file repo/tmp/cache/summaries/origin.sig
@@ -208,6 +212,8 @@ echo "ok pull with signed summary remote old summary"
 # Reset to the old valid summary and pull to cache it
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
+touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
+touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
 repo_reinit
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
@@ -220,6 +226,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
 # is caching the old signature. This should succeed because the cached
 # old summary is used.
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
+touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
 assert_has_file repo/tmp/cache/summaries/origin.sig
@@ -228,6 +235,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
 
 # Publish correct signature and check that subsequent pull succeeds
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
+touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
 assert_has_file repo/tmp/cache/summaries/origin.sig
@@ -239,6 +247,8 @@ echo "ok pull with signed summary remote old summary signature"
 # Reset to the old valid summary and pull to cache it
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
+touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
+touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
 repo_reinit
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
@@ -273,6 +283,8 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
 # Publish new signature and check that subsequent pull succeeds
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
 cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
+touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
+touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
 ${OSTREE} --repo=repo pull origin main
 assert_has_file repo/tmp/cache/summaries/origin
 assert_has_file repo/tmp/cache/summaries/origin.sig
diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 3072c212..77f07c4d 100755
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -66,7 +66,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <