diff options
| author | Luca BRUNO <luca.bruno@coreos.com> | 2021-07-12 08:38:38 +0000 |
|---|---|---|
| committer | Luca BRUNO <luca.bruno@coreos.com> | 2021-07-12 08:38:38 +0000 |
| commit | 38c14b374567f736533f7f515595208fe359819f (patch) | |
| tree | 44b2c450c7a67c9a4397a543577947f99e224c8c | |
| parent | a8bf003a9733386ac0389aaeb5d6c7ba3e4adaa0 (diff) | |
| download | ostree-38c14b374567f736533f7f515595208fe359819f.tar.gz | |
Release 2021.3v2021.3
| -rw-r--r-- | Makefile-libostree.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libostree/libostree-devel.sym | 8 | ||||
| -rw-r--r-- | src/libostree/libostree-released.sym | 8 | ||||
| -rwxr-xr-x | tests/test-symbols.sh | 2 |
5 files changed, 13 insertions, 13 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 82b9cf32..c3f700ad 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2021]) m4_define([release_version], [3]) 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 1af5f449..e3cd14a4 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -22,14 +22,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2021.3 { -global: - ostree_repo_auto_lock_push; - ostree_repo_auto_lock_cleanup; - ostree_repo_lock_push; - ostree_repo_lock_pop; -} LIBOSTREE_2021.2; - /* 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 9a45c0d8..becdfc55 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -653,6 +653,14 @@ global: ostree_content_writer_finish; } LIBOSTREE_2021.1; +LIBOSTREE_2021.3 { +global: + ostree_repo_auto_lock_push; + ostree_repo_auto_lock_cleanup; + ostree_repo_lock_push; + ostree_repo_lock_pop; +} LIBOSTREE_2021.2; + /* 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 14adc867..89c3eb07 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 -d42f7000de88e3c7280c2d55ad3a5e2e7a8d968758fe1d66a95863e2f5269d3c ${released_syms} +d4eb6d642150d9285b399c7a429603124aeda4215d3f62b92ad3956f04dd2dfe ${released_syms} EOF sha256sum -c released-sha256.txt |