Release 2021.2

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index d40de48d13fe8c7cd9c5d4458ae0e60aa3a55e29..dd396974064ae6c8107864bad34552bcc5b6e7e6 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -173,9 +173,9 @@ endif # USE_GPGME
 symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym
 
 # Uncomment this include when adding new development symbols.
-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=

diff --git a/configure.ac b/configure.ac
index f372a0eb11df63c1d490113cbf7f1494ea11b881..e8108732624bcf3fd1b629dff0b19652e6e3b15d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define([year_version], [2021])
 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/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 1cf6250d1e0698830325d2e090af1e1a2f530ade..03797a25d22d7ce0546ab17c99884d6bd159f539 100644 (file)
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -182,4 +182,4 @@ For a detailed walk-through on building, modifying, and testing, see this [tutor
 
 Releases can be performed by [creating a new release ticket][new-release-ticket] and following the steps in the checklist there.
 
-[new-release-ticket]: https://github.com/ostreedev/ostree/new?labels=kind/release&template=release-checklist.md
+[new-release-ticket]: https://github.com/ostreedev/ostree/issues/new?labels=kind/release&template=release-checklist.md

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 8cc11c658c8127d4cb41d04418d398fa32e4c4e2..e3cd14a4afe56c8312e676914df80f6d08d329e0 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -22,15 +22,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2021.2 {
-global:
-  ostree_repo_write_regfile_inline;
-  ostree_repo_write_symlink;
-  ostree_repo_write_regfile;
-  ostree_content_writer_get_type;
-  ostree_content_writer_finish;
-} LIBOSTREE_2021.1;
-
 /* 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 f1c773b3cdc09ad951a64ef5754c750145f89a6c..9a45c0d8ac0d80563f348efc0dd8173e87325b8a 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -644,6 +644,15 @@ global:
   ostree_sysroot_require_booted_deployment;
 } LIBOSTREE_2020.8;
 
+LIBOSTREE_2021.2 {
+global:
+  ostree_repo_write_regfile_inline;
+  ostree_repo_write_symlink;
+  ostree_repo_write_regfile;
+  ostree_content_writer_get_type;
+  ostree_content_writer_finish;
+} LIBOSTREE_2021.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 2f7d9d02d0e9eb7ca9686bfbb6cd3810b4b6f584..14adc867ae0a97dda5c0e71c082804a79fdc77aa 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -56,7 +56,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-07a58e073b075b0c1c9862846dba2bb177d121bbbf503d960b30ede27aef30eb  ${released_syms}
+d42f7000de88e3c7280c2d55ad3a5e2e7a8d968758fe1d66a95863e2f5269d3c  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt