Merge pull request #2895 from cgwalters/release

Release 2023.4
ostreedev · Jun 20, 2023 · 24dd9bb · 24dd9bb
2 parents f07c93e + a603512
commit 24dd9bb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Makefile-libostree.am b/Makefile-libostree.am
@@ -174,9 +174,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=

diff --git 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], [2023])
-m4_define([release_version], [4])
+m4_define([release_version], [5])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [[email protected]])
 is_release_build=no

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
@@ -20,11 +20,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2023.4 {
-global:
-  ostree_repo_commit_add_composefs_metadata;
-} LIBOSTREE_2023.1;
-
 /* 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
  * source.  Replace $LASTSTABLE with the last stable version, and $NEWVERSION

diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
@@ -701,6 +701,11 @@ global:
   ostree_repo_regenerate_metadata;
 } LIBOSTREE_2022.7;
 
+LIBOSTREE_2023.4 {
+global:
+  ostree_repo_commit_add_composefs_metadata;
+} LIBOSTREE_2023.1;
+
 /* 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
@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-e300a2e86f4a2ac620af8369f4b0f41dbe53fada187cce1d21d3c48073e9b454  ${released_syms}
+d47eb3e860d729d9789f1f76b6e02673c72bcd99a2fd48f5b1b36910d34ddd76  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt