Merge pull request #3280 from cgwalters/release

Release 2024.7
ostreedev · Jul 19, 2024 · 5dac2ad · 5dac2ad
2 parents 4b96359 + 68679e0
commit 5dac2ad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Makefile-libostree.am b/Makefile-libostree.am
@@ -175,9 +175,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/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
@@ -20,11 +20,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2024.7 {
-global:
-  ostree_repo_checkout_composefs;
-} LIBOSTREE_2023.8;
-
 /* 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
@@ -713,6 +713,11 @@ global:
   ostree_sysroot_change_finalization;
 } LIBOSTREE_2023.4;
 
+LIBOSTREE_2024.7 {
+global:
+  ostree_repo_checkout_composefs;
+} LIBOSTREE_2023.8;
+
 /* 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
@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-b42b9f10de219a35ce645215ac32d3dfb8467c6d9ac63ef9caeef00f12669ea7  ${released_syms}
+2cbaf02fbd6d5e07cc59597dd5fc21a548bb66dde99a96c3f07fa0e46699ae57  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt