Merge pull request #2631 from cgwalters/release-2022-4

Release 2022.4

Makefile-libostree.am

@@ -171,9 +171,9 @@ endif # USE_GPGME
 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
+#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], [4])
+m4_define([release_version], [5])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
 is_release_build=no

src/libostree/libostree-devel.sym

@@ -20,11 +20,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2022.4 {
-global:
-  ostree_fs_get_all_xattrs;
-  ostree_fs_get_all_xattrs_at;
-} LIBOSTREE_2021.5;
 
 /* 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

@@ -677,6 +677,12 @@ global:
   ostree_repo_traverse_commit_with_flags;
 } LIBOSTREE_2021.5;
 
+LIBOSTREE_2022.4 {
+global:
+  ostree_fs_get_all_xattrs;
+  ostree_fs_get_all_xattrs_at;
+} LIBOSTREE_2021.5;
+
 /* 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
-4f0600ad7af4ba937f463dc0bdc38aef6f53b154e88730b935552330c6a19a3f  ${released_syms}
+fb66f84d9af5270ed34fdf9f70f97e59394336a9559f493917704bdffa19027d  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt