From 32a3a1297312e566df3141c6c7e3b99709e474b1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 13 Oct 2020 14:31:26 -0400 Subject: [PATCH 1/2] Release 2020.7 --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 14 -------------- src/libostree/libostree-released.sym | 14 ++++++++++++++ tests/test-symbols.sh | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index de219eab..13f5bef8 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ m4_define([year_version], [2020]) 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 341a22a8..2ed658c4 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -17,20 +17,6 @@ Boston, MA 02111-1307, USA. ***/ -LIBOSTREE_2020.7 { -global: - /* Add symbols here, and uncomment the bits in - * Makefile-libostree.am to enable this too. - */ - ostree_repo_static_delta_execute_offline_with_signature; - ostree_repo_static_delta_verify_signature; - ostree_bootconfig_parser_get_overlay_initrds; - ostree_bootconfig_parser_set_overlay_initrds; - ostree_sysroot_deploy_tree_with_options; - ostree_sysroot_stage_tree_with_options; - ostree_sysroot_stage_overlay_initrd; -} LIBOSTREE_2020.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 e7d985ca..c154d8c1 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -622,6 +622,20 @@ global: /* No new symbols in 2020.6 */ +LIBOSTREE_2020.7 { +global: + /* Add symbols here, and uncomment the bits in + * Makefile-libostree.am to enable this too. + */ + ostree_repo_static_delta_execute_offline_with_signature; + ostree_repo_static_delta_verify_signature; + ostree_bootconfig_parser_get_overlay_initrds; + ostree_bootconfig_parser_set_overlay_initrds; + ostree_sysroot_deploy_tree_with_options; + ostree_sysroot_stage_tree_with_options; + ostree_sysroot_stage_overlay_initrd; +} LIBOSTREE_2020.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 697d9ad1..e4a0a943 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 < Date: Tue, 13 Oct 2020 14:33:14 -0400 Subject: [PATCH 2/2] Post-release version bump --- Makefile-libostree.am | 6 +++--- configure.ac | 4 ++-- src/libostree/libostree-devel.sym | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 96b9249b..a180e86b 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -182,9 +182,9 @@ libostree_1_la_SOURCES += \ endif # USE_GPGME symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym -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= EXTRA_DIST += \ diff --git a/configure.ac b/configure.ac index 13f5bef8..7a2f7ab6 100644 --- a/configure.ac +++ b/configure.ac @@ -7,10 +7,10 @@ dnl Seed the release notes with `git-shortlog-with-prs ..`. Th dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach dnl the tarball from `make dist`. m4_define([year_version], [2020]) -m4_define([release_version], [7]) +m4_define([release_version], [8]) 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]) diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index 2ed658c4..8e8d9c81 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -17,6 +17,10 @@ Boston, MA 02111-1307, USA. ***/ +/* Copy the bits below and uncomment the include in Makefile-libostree.am + when adding a symbol. +*/ + /* 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