Release 2021.1

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 6dbd00f59cb772a09388e07749f6b53c993963d6..ce784aff4381e9e48e0e8542445debcd7c47c5a1 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -179,9 +179,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 27442d2bf15ed109cf36e249bb246958ffa900b1..26713077a0d1ad9bf0844b9a18d852716515ee15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ([2.63])
 dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`.
-m4_define([year_version], [2020])
-m4_define([release_version], [9])
+m4_define([year_version], [2021])
+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 02159cd2f492d8135dbda0fe45d7b1b5cd17aa5f..e2d6efc4d0e5d86a0279f5c7f3ada9a11a8a2c6f 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -22,12 +22,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2021.1 {
-global:
-  ostree_commit_metadata_for_bootable;
-  ostree_sysroot_require_booted_deployment;
-} LIBOSTREE_2020.8;
-
 /* 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 4f80d7fc95ebc10626346013ea24d565234c2884..f1c773b3cdc09ad951a64ef5754c750145f89a6c 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -638,6 +638,12 @@ global:
   ostree_repo_gpg_sign_data;
 } LIBOSTREE_2020.7;
 
+LIBOSTREE_2021.1 {
+global:
+  ostree_commit_metadata_for_bootable;
+  ostree_sysroot_require_booted_deployment;
+} LIBOSTREE_2020.8;
+
 /* 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 3072c212611b666ca5d62d9672a21a604b00dd92..77f07c4d0cf4b1f98adf015bca2e0a45ff3a2942 100755 (executable)
--- 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
-3e677623543b7fdc57b0e3d9c66eb477105b014411259762a328c1b5e82068f0  ${released_syms}
+07a58e073b075b0c1c9862846dba2bb177d121bbbf503d960b30ede27aef30eb  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt