From 75f2f7d50d07c0a98f429e6974685a87adea9584 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 21 Mar 2025 08:11:50 -0400 Subject: [PATCH 1/3] tests/auto-prune: Don't go negative - First I kept wondering what the magic of 10000 was here before looking above and noticing it matched the number of dtb files. Make a shared variable so the connection is more obvious - Next, I *believe* the intention of this test was to test the edge case of bytes vs blocks, but we ended up subtracting blocks and I think recent FCOS images happened to get small enough that we started going negative here. Fix this to convert the bytes into blocks. --- tests/kolainst/destructive/auto-prune.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/kolainst/destructive/auto-prune.sh b/tests/kolainst/destructive/auto-prune.sh index 03d60e41..38e88af0 100755 --- a/tests/kolainst/destructive/auto-prune.sh +++ b/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) From 1dd64eb264be462475a1163c6fee686c1f191994 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 19 Mar 2025 17:20:44 -0400 Subject: [PATCH 2/3] Release 2025.2 Signed-off-by: Colin Walters --- Makefile-libostree.am | 6 +++--- configure.ac | 2 +- src/libostree/libostree-devel.sym | 9 --------- src/libostree/libostree-released.sym | 9 +++++++++ tests/test-symbols.sh | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index e6c1e553..db31be75 100644 --- 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/configure.ac b/configure.ac index 5cedc542..f424b39a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2025]) m4_define([release_version], [2]) 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 bfc1e495..6640e11c 100644 --- a/src/libostree/libostree-devel.sym +++ b/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 diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index 8b14feca..feaefb07 100644 --- a/src/libostree/libostree-released.sym +++ b/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. */ diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh index 43ffabe6..44664cb2 100755 --- 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 < Date: Wed, 19 Mar 2025 17:21:08 -0400 Subject: [PATCH 3/3] Post-release version bump Signed-off-by: Colin Walters --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f424b39a..5e32d3dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ 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=yes +is_release_build=no AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([buildutil]) AC_CONFIG_AUX_DIR([build-aux])