guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 28a990ae323c2ba676b0d57cc5de0fc3a084ac2a
Author: Ludovic Courtès <[email protected]>
AuthorDate: Thu Sep 17 15:49:22 2026 +0200
linux-initrd: ‘base-initrd-modules’ correctly handles cross-compilation.
Previously, ‘base-initrd-modules’ would always return #f for a
cross-compilation target because the GNU triplet returned by
‘%current-target-system’ is different from the Nix system type that is
referred to in the ‘base-initrd-modules’ property.
* gnu/system/linux-initrd.scm (base-initrd-modules):
Pass (%current-target-system) through ‘gnu-triplet->nix-system’.
Reported-by: Yelninei <[email protected]>
Signed-off-by: Ludovic Courtès <[email protected]>
Merges: #11289
---
gnu/system/linux-initrd.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index cce90956a59..cf4b5474f2a 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -371,7 +371,8 @@ FILE-SYSTEMS."
(define* (base-initrd-modules
kernel
#:optional
- (system (or (%current-target-system)
+ (system (or (and=> (%current-target-system)
+ gnu-triplet->nix-system)
(%current-system))))
"Return a list of modules tailored to KERNEL for SYSTEM to include in the
initrd by default."
