From 70b352bc1fb6a125104276456f1fb7b9deeea895 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 May 2026 11:22:33 +0300 Subject: [PATCH] Drop discoverable_partition_specification hunk merged upstream in 1.15.2 The first hunk of the riscv64 patch adds an else-if branch to this_arch_root() in crates/lib/src/discoverable_partition_specification.rs. Upstream bootc accepted the same change in commit 47c3620 ("fix: add riscv64 to this_arch_root"), shipped in v1.15.2. As a result the hunk now matches already-applied code and `patch -f --fuzz=0` fails the whole %prep, breaking build #56177 on every arch. Drop that hunk; keep the two install.rs / install/baseline.rs hunks, which upstream still does not have. --- ...001-Add-riscv64-architecture-support.patch | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/files/0001-Add-riscv64-architecture-support.patch b/files/0001-Add-riscv64-architecture-support.patch index e9659ff..de74933 100644 --- a/files/0001-Add-riscv64-architecture-support.patch +++ b/files/0001-Add-riscv64-architecture-support.patch @@ -8,30 +8,20 @@ RISC-V uses UEFI boot like aarch64, so no special bootloader partition is needed. Changes: -- discoverable_partition_specification: add riscv64 to this_arch_root() - install: add riscv64 to ARCH_USES_EFI - install/baseline: add riscv64 to partitioning arch checks +Note: the riscv64 branch in this_arch_root() (in +crates/lib/src/discoverable_partition_specification.rs) was accepted +upstream in bootc commit 47c3620 ("fix: add riscv64 to this_arch_root") +and is already present in v1.15.2, so it is no longer carried here. + Signed-off-by: Andrew Lukoshko --- - crates/lib/src/discoverable_partition_specification.rs | 2 ++ - crates/lib/src/install.rs | 2 +- - crates/lib/src/install/baseline.rs | 2 +- - 3 files changed, 4 insertions(+), 2 deletions(-) + crates/lib/src/install.rs | 2 +- + crates/lib/src/install/baseline.rs | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/crates/lib/src/discoverable_partition_specification.rs b/crates/lib/src/discoverable_partition_specification.rs -index d5432e7..344b232 100644 ---- a/crates/lib/src/discoverable_partition_specification.rs -+++ b/crates/lib/src/discoverable_partition_specification.rs -@@ -457,6 +457,8 @@ pub const fn this_arch_root() -> &'static str { - ROOT_PPC64 - } else if #[cfg(all(target_arch = "powerpc64", target_endian = "little"))] { - ROOT_PPC64_LE -+ } else if #[cfg(target_arch = "riscv64")] { -+ ROOT_RISCV64 - } else { - compile_error!("Unsupported architecture") - } diff --git a/crates/lib/src/install.rs b/crates/lib/src/install.rs index 105e2b3..052b208 100644 --- a/crates/lib/src/install.rs @@ -60,3 +50,4 @@ index d05604e..34d3187 100644 anyhow::bail!("Unsupported architecture: {}", std::env::consts::ARCH); -- 2.43.0 +