From 80435e12a7ec055195d2355b60a0882b65d42a94 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 24 Apr 2019 16:12:31 -0400 Subject: [PATCH] Release 2019.2 Also add `ostree_repo_get_bootloader` to the public API, which was missed when it was initially merged. Closes: #1844 Approved by: rfairley --- apidoc/ostree-sections.txt | 1 + configure.ac | 2 +- src/libostree/libostree-devel.sym | 8 ++++---- src/libostree/libostree-released.sym | 7 +++++++ tests/test-symbols.sh | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt index 5dbafc5fdf..1a26e1ebdf 100644 --- a/apidoc/ostree-sections.txt +++ b/apidoc/ostree-sections.txt @@ -293,6 +293,7 @@ ostree_repo_is_system ostree_repo_is_writable ostree_repo_create_at ostree_repo_create +ostree_repo_get_bootloader ostree_repo_get_path ostree_repo_get_mode ostree_repo_get_min_free_space_bytes diff --git a/configure.ac b/configure.ac index 3a2b1362e8..e6e145db20 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ m4_define([year_version], [2019]) m4_define([release_version], [2]) 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 4ff2b86f9d..8d9a7bfcd9 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -18,15 +18,15 @@ ***/ /* Add new symbols here. Release commits should copy this section into -released.sym. */ -LIBOSTREE_2018.10 { +LIBOSTREE_2019.3 { } LIBOSTREE_2018.9; /* Stub section for the stable release *after* this development one; don't - * edit this other than to update the last number. This is just a copy/paste + * edit this other than to update the year. This is just a copy/paste * source. Replace $LASTSTABLE with the last stable version, and $NEWVERSION * with whatever the next version with new symbols will be. -LIBOSTREE_2018.$NEWVERSION { +LIBOSTREE_2019.$NEWVERSION { global: someostree_symbol_deleteme; -} LIBOSTREE_2018.$LASTSTABLE; +} LIBOSTREE_2019.$LASTSTABLE; */ diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index 90b363cad4..a4daaf1cfb 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -542,6 +542,13 @@ LIBOSTREE_2018.9 { ostree_repo_get_default_repo_finders; } LIBOSTREE_2018.7; +/* No new symbols in 2019.1 */ + +LIBOSTREE_2019.2 { + ostree_repo_get_bootloader; +} LIBOSTREE_2018.9; + + /* 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 47f3ad7377..ac058fad42 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 <