From 75342035d5902f299be53d7b541724407463d62c Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 25 Sep 2020 14:59:45 -0400 Subject: [PATCH 1/2] Makefile-libostree.am: Uncomment BUILDOPT_IS_DEVEL_BUILD conditional We shouldn't have to toggle the conditional itself during release builds. It should only evaluate to true during devel builds. --- Makefile-libostree.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 1d31c4d8..96b9249b 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -182,9 +182,9 @@ libostree_1_la_SOURCES += \ endif # USE_GPGME symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym -#if BUILDOPT_IS_DEVEL_BUILD +if BUILDOPT_IS_DEVEL_BUILD symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym -#endif +endif # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html wl_versionscript_arg = -Wl,--version-script= EXTRA_DIST += \ From f04e5d047d7cc4c162ff9760d062924522ec2397 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 25 Sep 2020 15:01:09 -0400 Subject: [PATCH 2/2] lib: Minor versioning related fixes Fix/add the `Since` marker to the new static delta APIs, and update the symbol versioning templates/comments. --- src/libostree/libostree-devel.sym | 2 +- src/libostree/libostree-released.sym | 2 ++ src/libostree/ostree-repo-static-delta-core.c | 4 +++- tests/test-symbols.sh | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index a15654c1..f74f0e00 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -17,7 +17,7 @@ Boston, MA 02111-1307, USA. ***/ -LIBOSTREE_2020.6 { +LIBOSTREE_2020.7 { global: /* Add symbols here, and uncomment the bits in * Makefile-libostree.am to enable this too. diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index aee434cb..e7d985ca 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -620,6 +620,8 @@ global: /* No new symbols in 2020.5 */ +/* No new symbols in 2020.6 */ + /* NOTE: Only add more content here in release commits! See the * comments at the top of this file. */ diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c index 02d517a1..d83ec8c4 100644 --- a/src/libostree/ostree-repo-static-delta-core.c +++ b/src/libostree/ostree-repo-static-delta-core.c @@ -317,6 +317,8 @@ _ostree_repo_static_delta_verify_signature (OstreeRepo *self, * The directory must be named with the form "FROM-TO", where both are * checksums, and it must contain a file named "superblock", along with at least * one part. + * + * Since: 2020.7 */ gboolean ostree_repo_static_delta_execute_offline_with_signature (OstreeRepo *self, @@ -1082,7 +1084,7 @@ _ostree_repo_static_delta_dump (OstreeRepo *self, * Returns: TRUE if the signature of static delta file is valid using the * signature engine provided, FALSE otherwise. * - * Since: 2020.1 + * Since: 2020.7 */ gboolean ostree_repo_static_delta_verify_signature (OstreeRepo *self, diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh index a0781618..697d9ad1 100755 --- 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 <