diff options
| author | Colin Walters <walters@verbum.org> | 2021-10-05 15:59:43 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2021-10-05 15:59:43 -0400 |
| commit | 63bf5e606b24c7343bfe622bf6af2110ee6beabc (patch) | |
| tree | 72ed27febe53b187368d8551777c8661f1a2c7bd | |
| parent | 8cb5d920c4b89d17c196f30f2c59fcbd4c762a17 (diff) | |
| download | ostree-63bf5e606b24c7343bfe622bf6af2110ee6beabc.tar.gz | |
Release 2021.5v2021.5
| -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 | 6 | ||||
| -rwxr-xr-x | tests/test-symbols.sh | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index d40de48d..6b94f76f 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 5678145a..b5a3c82a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2021]) 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 +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 6b6b5c6c..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.5 { -global: - ostree_sepolicy_new_from_commit; - ostree_mutable_tree_new_from_commit; -} LIBOSTREE_2021.4; - /* 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 1e359bfb..d38362ba 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -668,6 +668,12 @@ global: ostree_repo_signature_verify_commit_data; } LIBOSTREE_2021.3; +LIBOSTREE_2021.5 { +global: + ostree_sepolicy_new_from_commit; + ostree_mutable_tree_new_from_commit; +} LIBOSTREE_2021.4; + /* 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 0de87be4..a094a944 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 -9d020c9696a6df66b32714dc1ef37d06bb90b4adf8b248558b5838f9ee18729a ${released_syms} +b28728cc162642b66ca7d9c4333b8e63dedf6321b29a3a019037d8c0c609e00d ${released_syms} EOF sha256sum -c released-sha256.txt |