diff options
author | Colin Walters <walters@verbum.org> | 2021-04-15 12:58:31 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2021-04-15 13:02:48 -0400 |
commit | 6a72674ec621a2282043c3a083fe1e45cd6a8761 (patch) | |
tree | bf77b8baad611588b1fa376a1ad2ebf158e46b64 | |
parent | 36693f064c63dad550ebcfed33bf9b95806ddef9 (diff) | |
download | ostree-2021.2.tar.gz |
Release 2021.2v2021.2
-rw-r--r-- | Makefile-libostree.am | 6 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | docs/CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | src/libostree/libostree-devel.sym | 9 | ||||
-rw-r--r-- | src/libostree/libostree-released.sym | 9 | ||||
-rwxr-xr-x | tests/test-symbols.sh | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index d40de48d..dd396974 100644 --- 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 f372a0eb..e8108732 100644 --- 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 1cf6250d..03797a25 100644 --- 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 8cc11c65..e3cd14a4 100644 --- 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 f1c773b3..9a45c0d8 100644 --- 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 2f7d9d02..14adc867 100755 --- 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 |