diff options
| author | Colin Walters <walters@verbum.org> | 2021-09-09 07:34:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 07:34:59 -0400 |
| commit | 09804f7a093b45adf4d36820fa5158990e89276d (patch) | |
| tree | 98ccecf3a47d060165af5f9bf9d94faea1a833e2 | |
| parent | ce36e05d38ab8bf0f95ea103349d0814ad30e574 (diff) | |
| parent | d1a73e1aba2704ef4420531974b29f218e266d2e (diff) | |
| download | ostree-09804f7a093b45adf4d36820fa5158990e89276d.tar.gz | |
Merge pull request #2438 from cgwalters/release-2021.4v2021.4
Release 2021.4
| -rw-r--r-- | Makefile-libostree.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libostree/libostree-devel.sym | 6 | ||||
| -rw-r--r-- | src/libostree/libostree-released.sym | 7 | ||||
| -rwxr-xr-x | tests/test-symbols.sh | 2 |
5 files changed, 12 insertions, 11 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 4002a8c7..5678145a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.63]) dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`. m4_define([year_version], [2021]) -m4_define([release_version], [4]) +m4_define([release_version], [5]) 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 7e6f7784..e3cd14a4 100644 --- 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.4 { -global: - ostree_repo_remote_get_gpg_keys; - ostree_repo_signature_verify_commit_data; -} LIBOSTREE_2021.3; - /* 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 becdfc55..1e359bfb 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -661,6 +661,13 @@ global: ostree_repo_lock_pop; } LIBOSTREE_2021.2; + +LIBOSTREE_2021.4 { +global: + ostree_repo_remote_get_gpg_keys; + ostree_repo_signature_verify_commit_data; +} LIBOSTREE_2021.3; + /* 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 89c3eb07..0de87be4 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 -d4eb6d642150d9285b399c7a429603124aeda4215d3f62b92ad3956f04dd2dfe ${released_syms} +9d020c9696a6df66b32714dc1ef37d06bb90b4adf8b248558b5838f9ee18729a ${released_syms} EOF sha256sum -c released-sha256.txt |