From 4941d9cd0de9465ac41aaba27f18763da2cd6599 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 18 Jul 2024 11:39:10 -0400 Subject: [PATCH] Release 2024.7 Signed-off-by: Colin Walters --- Makefile-libostree.am | 6 +++--- configure.ac | 2 +- src/libostree/libostree-devel.sym | 5 ----- src/libostree/libostree-released.sym | 5 +++++ tests/test-symbols.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 915b20b8..11a7bbed 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -175,9 +175,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 index 538ff345..b2209eda 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2024]) m4_define([release_version], [7]) 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 5c4bddb8..6640e11c 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_2024.7 { -global: - ostree_repo_checkout_composefs; -} LIBOSTREE_2023.8; - /* 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 2729d517..36e8fd8f 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -713,6 +713,11 @@ global: ostree_sysroot_change_finalization; } LIBOSTREE_2023.4; +LIBOSTREE_2024.7 { +global: + ostree_repo_checkout_composefs; +} LIBOSTREE_2023.8; + /* 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 574abc7a..2677cf8b 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 <