Merge pull request #3396 from cgwalters/release

Release 2025.2

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=

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], [2025])
-m4_define([release_version], [2])
+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

src/libostree/libostree-devel.sym

@@ -20,15 +20,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2025.2 {
-global:
-  ostree_sepolicy_set_null_log;
-  ostree_sign_read_pk;
-  ostree_sign_read_sk;
-  ostree_blob_reader_get_type;
-  ostree_blob_reader_read_blob;
-} LIBOSTREE_2025.1;
-
 /* 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

src/libostree/libostree-released.sym

@@ -723,6 +723,15 @@ global:
   ostree_sysroot_deployment_kexec_load;
 } LIBOSTREE_2024.7;
 
+LIBOSTREE_2025.2 {
+global:
+  ostree_sepolicy_set_null_log;
+  ostree_sign_read_pk;
+  ostree_sign_read_sk;
+  ostree_blob_reader_get_type;
+  ostree_blob_reader_read_blob;
+} LIBOSTREE_2025.1;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */

tests/kolainst/destructive/auto-prune.sh

@@ -33,6 +33,8 @@ assert_not_journal_grep() {
     fi
 }
 
+block_size=$(stat --file-system /boot -c '%s')
+
 # make two fake ostree commits with modified kernels of about the same size
 cd /root
 mkdir -p rootfs/usr/lib/modules/`uname -r`
@@ -53,9 +55,8 @@ assert_bootfs_has_n_bootcsum_dirs() {
 }
 
 consume_bootfs_space() {
-    local free_blocks block_size
+    local free_blocks
     free_blocks=${1:-$(stat --file-system /boot -c '%a')}
-    block_size=$(stat --file-system /boot -c '%s')
     # leave 1 block free
     unshare -m bash -c \
       "mount -o rw,remount /boot && \
@@ -173,11 +174,13 @@ assert_journal_grep "$cursor" "updating bootloader in two steps"
 unconsume_bootfs_space
 
 mkdir -p rootfs/usr/lib/modules/`uname -r`/dtb
-(set +x; for i in {1..10000}; do echo -n x > rootfs/usr/lib/modules/`uname -r`/dtb/$i; done)
+dtbcount=10000
+(set +x; for i in {1..${dtbcount}}; do echo -n x > rootfs/usr/lib/modules/`uname -r`/dtb/$i; done)
 ostree commit --base modkernel1 -P --tree=dir=rootfs -b modkernel3
 
 # a naive estimator would think all those files just take 10000 bytes
-consume_bootfs_space "$((free_blocks_kernel_and_initrd - 10000))"
+dtb_naive_space=$((${dtbcount} / ${block_size}))
+consume_bootfs_space "$((free_blocks_kernel_and_initrd - ${dtb_naive_space}))"
 
 rpm-ostree rebase :modkernel3
 cursor=$(journal_cursor)

tests/test-symbols.sh

@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-b242c2d7e73be550c21fee6ccf00509a5c1bea2d3c62095acf62cffc5f43bd64  ${released_syms}
+eea94bdacf0f6a52c15ec5586372947b3e8467f42b8d08166df3576218774725  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt