From d2e22230747eda0f832f70351bd04a8dc534a0da Mon Sep 17 00:00:00 2001 From: Joseph Marrero Corchado Date: Mon, 26 Jan 2026 11:29:42 -0500 Subject: [PATCH] Rebase to 2025.7 Resolves: #RHEL-129049 --- .gitignore | 1 + ...y-Fix-path-to-aboot.cfg-in-BLS-files.patch | 35 ------------------- ostree.spec | 9 +++-- sources | 2 +- 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch diff --git a/.gitignore b/.gitignore index 8f3cbdc..b0cca2b 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ /libostree-2025.4.tar.xz /libostree-2025.5.tar.xz /libostree-2025.6.tar.xz +/libostree-2025.7.tar.xz diff --git a/0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch b/0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch deleted file mode 100644 index 97717f0..0000000 --- a/0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 36995ef2b6dff343434016433a46242861549edd Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -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 ---- - 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 - diff --git a/ostree.spec b/ostree.spec index 8f887b5..38e59c9 100644 --- a/ostree.spec +++ b/ostree.spec @@ -7,8 +7,8 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2025.6 -Release: 3%{?dist} +Version: 2025.7 +Release: 1%{?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 @@ -181,6 +181,11 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Mon Jan 26 2026 Joseph Marrero - 2025.7-1 +- Rebase to 2025.7 + Backport https://github.com/ostreedev/ostree/pull/3555 + Resolves: #RHEL-129049 + * Wed Jan 21 2026 Joseph Marrero - 2025.6-3 - Backport https://github.com/ostreedev/ostree/pull/3555 Resolves: #RHEL-131656 diff --git a/sources b/sources index 9ebab4c..e79d622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libostree-2025.6.tar.xz) = ca321175a9272cc7f6c3d7a3989d90d2cbb53def41ac2984ce6a60a05007b5760960a1bf4e9a5f13adc246c7061214424f21a5a284c201d8c4a4f5c619c6e02d +SHA512 (libostree-2025.7.tar.xz) = bf10001f64b11c1aa5c7c4d5fee744b2ee1ea950adf1efd69f315d18e428967daba2ea4aa1120b9e2a0b8e56f7664601c396eb57ff833299bf86ed003ece60da