From d3fa95023e1d944f5923064d5b19cc6ee62cf80a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 12 Jan 2018 15:27:44 -0500 Subject: [PATCH] Release 2018.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In particular I'd like to get the `--copyup` changes out for an rpm-ostree release that will use them. But there are other good changes here, and let's keep up a regular release train 🚄 in general. Closes: #1413 Approved by: jlebon --- configure.ac | 6 +++--- src/libostree/libostree-devel.sym | 4 ++-- src/libostree/libostree-released.sym | 3 +++ tests/test-symbols.sh | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e26c903c..a4e1e74f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ dnl If doing a final release, remember to follow the instructions to dnl update libostree-released.sym from libostree-devel.sym, and update the checksum dnl in test-symbols.sh, and also set is_release_build=yes below. Then make dnl another post-release commit to bump the version, and set is_release_build=no. -m4_define([year_version], [2017]) -m4_define([release_version], [16]) +m4_define([year_version], [2018]) +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 5ab4b99c..cdd6b7ca 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -18,8 +18,8 @@ ***/ /* Add new symbols here. Release commits should copy this section into -released.sym. */ -LIBOSTREE_2017.16 { -} LIBOSTREE_2017.15; +LIBOSTREE_2018.2 { +} LIBOSTREE_2018.1; /* 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 diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index b7d57853..51cd31a1 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -451,6 +451,9 @@ LIBOSTREE_2017.15 { ostree_break_hardlink; } LIBOSTREE_2017.14; +LIBOSTREE_2018.1 { +} LIBOSTREE_2017.15; + /* 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 51137d6c..02facd2c 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -52,7 +52,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt <