Merge pull request #2678 from cgwalters/release-2022-5

Release 2022 5

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=

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

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]

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

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.
  */

tests/test-symbols.sh

@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-34ff6c97e20242a449b210f7452a12d0bb6ac9e135638f71c2d27b2f2b583ef3  ${released_syms}
+370e560e4044b17523d23b04e383539cd22eac7c3067b7324803129ceebd73f0  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt