import CS ostree-2025.4-2.el9

.gitignore

@@ -1 +1 @@
-SOURCES/libostree-2025.1.tar.xz
+SOURCES/libostree-2025.4.tar.xz

.ostree.metadata

@@ -1 +1 @@
-d1ad76514f2dcc673d1d6c38707b2f9cbd062632 SOURCES/libostree-2025.1.tar.xz
+231dae5d34dd543e4df092cfa89d81a0b1cce928 SOURCES/libostree-2025.4.tar.xz

SOURCES/0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch

@@ -0,0 +1,35 @@
+From 36995ef2b6dff343434016433a46242861549edd Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Wed, 6 Aug 2025 12:16:34 +0200
+Subject: [PATCH] deploy: Fix path to aboot.cfg in BLS files
+
+The change in https://github.com/ostreedev/ostree/pull/3413/ was meant
+to change when the abootcfg option is set in the BLS file.  However,
+it also changed the value of this key, using the wrong directory
+(bootcsumdir instead of /usr/lib/ostree-boot).
+
+This means that during update, aboot-update gets the wrong path to the
+config and cannot correctly write the aboot partition.
+
+Signed-off-by: Alexander Larsson <alexl@redhat.com>
+---
+ src/libostree/ostree-sysroot-deploy.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index bee899a3..e8f3ece5 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -2134,7 +2134,8 @@ install_deployment_kernel (OstreeSysroot *sysroot, int new_bootversion,
+       g_autofree char *aboot_relpath = g_strconcat ("/", bootcsumdir, "/", aboot_fn, NULL);
+       ostree_bootconfig_parser_set (bootconfig, "aboot", aboot_relpath);
+ 
+-      g_autofree char *abootcfg_relpath = g_strconcat ("/", bootcsumdir, "/aboot.cfg", NULL);
++      g_autofree char *abootcfg_relpath
++          = g_strconcat ("/", deployment_dirpath, "/usr/lib/ostree-boot/aboot.cfg", NULL);
+       ostree_bootconfig_parser_set (bootconfig, "abootcfg", abootcfg_relpath);
+     }
+ 
+-- 
+2.50.1
+

SPECS/ostree.spec

@@ -7,12 +7,14 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2025.1
-Release: 1%{?dist}
+Version: 2025.4
+Release: 2%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 Source1: ostree-readonly-sysroot-migration
 Source2: ostree-readonly-sysroot-migration.service
 
+Patch0: 0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch
+
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
@@ -179,6 +181,18 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Wed Aug 06 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.4-2
+- Backport https://github.com/ostreedev/ostree/pull/3493
+  Resolves: #RHEL-107855
+
+* Fri Jul 11 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.4-1
+- Rebase to https://github.com/ostreedev/ostree/releases/tag/v2025.4
+  Resolves: #RHEL-104888
+
+* Mon Mar 24 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.2-1
+- Rebase to https://github.com/ostreedev/ostree/releases/tag/v2025.2
+  Resolves: #RHEL-84765
+
 * Mon Jan 20 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.1-1
 - Rebase to https://github.com/ostreedev/ostree/releases/tag/v2025.1
   Resolves: #RHEL-73827