From e9e4b9112083228b8c385ad26924b6c4623f4179 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 19 Mar 2021 21:53:37 +0000 Subject: [PATCH] Release 2021.1 --- Makefile-libostree.am | 6 +++--- configure.ac | 6 +++--- src/libostree/libostree-devel.sym | 6 ------ src/libostree/libostree-released.sym | 6 ++++++ tests/test-symbols.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 6dbd00f5..ce784aff 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -179,9 +179,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 27442d2b..26713077 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], [2020]) -m4_define([release_version], [9]) +m4_define([year_version], [2021]) +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 02159cd2..e2d6efc4 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -22,12 +22,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2021.1 { -global: - ostree_commit_metadata_for_bootable; - ostree_sysroot_require_booted_deployment; -} LIBOSTREE_2020.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 4f80d7fc..f1c773b3 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -638,6 +638,12 @@ global: ostree_repo_gpg_sign_data; } LIBOSTREE_2020.7; +LIBOSTREE_2021.1 { +global: + ostree_commit_metadata_for_bootable; + ostree_sysroot_require_booted_deployment; +} LIBOSTREE_2020.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 3072c212..77f07c4d 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -66,7 +66,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt <