From 81560cada648b247ccdc9ea6ad4846a7276056e0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 15 Feb 2018 08:53:39 -0500 Subject: [PATCH] Release 2018.2 There are enough fixes here, and there are some potentially larger patches incoming like wmanley's checkout speedups and the payload link that will need soak time in master. Closes: #1455 Approved by: jlebon --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 3 --- src/libostree/libostree-released.sym | 4 ++++ tests/test-symbols.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 34a6d0bbea..1b299d55a0 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ m4_define([year_version], [2018]) 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 468fbc5002..46ad280cf5 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -18,9 +18,6 @@ ***/ /* Add new symbols here. Release commits should copy this section into -released.sym. */ -LIBOSTREE_2018.2 { - ostree_commit_get_content_checksum; -} 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 51cd31a1e1..6f86ddcd0f 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -454,6 +454,10 @@ LIBOSTREE_2017.15 { LIBOSTREE_2018.1 { } LIBOSTREE_2017.15; +LIBOSTREE_2018.2 { + ostree_commit_get_content_checksum; +} LIBOSTREE_2018.1; + /* 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 18bd085dd1..ffea248207 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 <