Merge pull request #2241 from lucab/release-2020.8

Release 2020.8

5 files changed, 20 insertions, 17 deletions

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index eeb0b6c6..02dbaded 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -184,9 +184,12 @@ 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
+
+## Uncomment this include when adding new development symbols.
+#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 7a2f7ab6..758fc49e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl Seed the release notes with `git-shortlog-with-prs <previous-release>..`. 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], [8])
+m4_define([release_version], [9])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
 is_release_build=no
diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 435be190..e2d6efc4 100644
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -15,14 +15,12 @@
   License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
-***/
 
-LIBOSTREE_2020.8 {
-global:
-  ostree_repo_list_static_delta_indexes;
-  ostree_repo_static_delta_reindex;
-  ostree_repo_gpg_sign_data;
-} LIBOSTREE_2020.7;
+  How to introduce the first new symbol for a development version:
+   - copy the stub content below to a new entry
+   - replace templated value as noted
+   - uncomment the include in Makefile-libostree.am
+*/
 
 /* 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
diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index c154d8c1..4f80d7fc 100644
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -596,7 +596,6 @@ global:
 /* No new symbols in 2020.2 */
 /* No new symbols in 2020.3 */
 
-/* Add new symbols here.  Release commits should copy this section into -released.sym. */
 LIBOSTREE_2020.4 {
 global:
   ostree_repo_commit_modifier_set_sepolicy_from_commit;
@@ -619,14 +618,10 @@ global:
 } LIBOSTREE_2020.1;
 
 /* No new symbols in 2020.5 */
-
 /* 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;
@@ -636,6 +631,13 @@ global:
   ostree_sysroot_stage_overlay_initrd;
 } LIBOSTREE_2020.4;
 
+LIBOSTREE_2020.8 {
+global:
+  ostree_repo_list_static_delta_indexes;
+  ostree_repo_static_delta_reindex;
+  ostree_repo_gpg_sign_data;
+} LIBOSTREE_2020.7;
+
 /* 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 e4a0a943..3072c212 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 <<EOF
-540ee37ff081a8649fd1b1fa3cf1b80f7b8abb01f6ba71eead0b3b828d6cb696  ${released_syms}
+3e677623543b7fdc57b0e3d9c66eb477105b014411259762a328c1b5e82068f0  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt