From 372c4444ddc4090608afedfe07e9a028d7b8758f Mon Sep 17 00:00:00 2001 From: Joseph Marrero Corchado Date: Tue, 14 Jan 2025 11:12:52 -0500 Subject: [PATCH] Release 2025.1 --- Makefile-libostree.am | 6 +++--- configure.ac | 6 +++--- src/libostree/libostree-devel.sym | 5 ----- src/libostree/libostree-released.sym | 5 +++++ tests/test-symbols.sh | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 915b20b8c2..11a7bbedd3 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 944d4bbe79..a65b9066b5 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], [2024]) -m4_define([release_version], [11]) +m4_define([year_version], [2025]) +m4_define([release_version], [1]) 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 0af241dcfa..6640e11c78 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.11 { -global: - ostree_sysroot_deployment_kexec_load; -} LIBOSTREE_2024.7; - /* 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 36e8fd8f93..8b14fecaae 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -718,6 +718,11 @@ global: ostree_repo_checkout_composefs; } LIBOSTREE_2023.8; +LIBOSTREE_2025.1 { +global: + ostree_sysroot_deployment_kexec_load; +} LIBOSTREE_2024.7; + /* 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 2677cf8bcd..43ffabe6c8 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 <