diff --git a/Makefile-libostree.am b/Makefile-libostree.am index dd7ed8df..f93f712a 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -174,9 +174,6 @@ symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym #if BUILDOPT_IS_DEVEL_BUILD #symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym #endif -if BUILDOPT_IS_DEVEL_BUILD -symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym -endif # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html wl_versionscript_arg = -Wl,--version-script= diff --git a/configure.ac b/configure.ac index 445c53e0..56e0e040 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.63]) dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`. m4_define([year_version], [2022]) -m4_define([release_version], [5]) +m4_define([release_version], [6]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) is_release_build=no diff --git a/rust-bindings/tests/sign/mod.rs b/rust-bindings/tests/sign/mod.rs index f3c817a3..300beedf 100644 --- a/rust-bindings/tests/sign/mod.rs +++ b/rust-bindings/tests/sign/mod.rs @@ -74,7 +74,9 @@ echo $ED25519SECRET > ed25519.secret let badsigs = [b"".as_slice()].to_variant(); let e = signer.data_verify(payload, &badsigs).err().unwrap(); - assert!(e.to_string().contains("Invalid signature length of 0 bytes")) + assert!(e + .to_string() + .contains("Invalid signature length of 0 bytes")) } #[test] diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index 145ec1ec..eef5cba0 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -20,11 +20,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2022.5 { -global: - ostree_kernel_args_append_if_missing; - ostree_sysroot_deployment_set_kargs_in_place; -} LIBOSTREE_2022.4; /* Stub section for the stable release *after* this development one; don't * edit this other than to update the year. This is just a copy/paste diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index 5afdfd3e..a5b9bdda 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -683,6 +683,12 @@ global: ostree_fs_get_all_xattrs_at; } LIBOSTREE_2022.2; +LIBOSTREE_2022.5 { +global: + ostree_kernel_args_append_if_missing; + ostree_sysroot_deployment_set_kargs_in_place; +} LIBOSTREE_2022.4; + /* NOTE: Only add more content here in release commits! See the * comments at the top of this file. */ diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh index a14849d5..6eeb73ae 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -54,7 +54,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt <