From 5b23804a1a41588ec7b92445ece978df6f0ba61a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 4 Dec 2023 18:28:32 -0500 Subject: [PATCH 1/2] Release 2023.8 --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 7 ------- src/libostree/libostree-released.sym | 7 +++++++ tests/test-symbols.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 4e83a4648e..13bef8c942 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2023]) m4_define([release_version], [8]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) -is_release_build=no +is_release_build=yes AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([buildutil]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index a221f08bc0..6640e11c78 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -20,13 +20,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2023.8 { -global: - ostree_sysroot_update_post_copy; - ostree_deployment_is_finalization_locked; - ostree_sysroot_change_finalization; -} LIBOSTREE_2023.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 * source. Replace $LASTSTABLE with the last stable version, and $NEWVERSION diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index 06cfc154cb..2729d51776 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -706,6 +706,13 @@ global: ostree_repo_commit_add_composefs_metadata; } LIBOSTREE_2023.1; +LIBOSTREE_2023.8 { +global: + ostree_sysroot_update_post_copy; + ostree_deployment_is_finalization_locked; + ostree_sysroot_change_finalization; +} LIBOSTREE_2023.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 f9b8f81e39..574abc7a5b 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 < Date: Mon, 4 Dec 2023 18:29:13 -0500 Subject: [PATCH 2/2] configure: post-release version bump --- Makefile-libostree.am | 2 +- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 46f0999b6b..b80be2e9f0 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -176,7 +176,7 @@ 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 +#symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym endif # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html diff --git a/configure.ac b/configure.ac index 13bef8c942..21315ae986 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ 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], [8]) +m4_define([release_version], [9]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) -is_release_build=yes +is_release_build=no AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([buildutil]) AC_CONFIG_AUX_DIR([build-aux])