[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: linux-initrd: Fix cross compilation.
From: |
guix-commits |
Subject: |
01/01: linux-initrd: Fix cross compilation. |
Date: |
Tue, 25 Jun 2019 15:38:56 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit fdbf4447bc028e6cc658a383ec338a1d3db61a56
Author: Mathieu Othacehe <address@hidden>
Date: Wed Mar 6 11:28:53 2019 +0100
linux-initrd: Fix cross compilation.
* gnu/system/linux-initrd.scm (default-initrd-modules): Check system name
against %current-target-system first in case we are cross-compiling.
---
gnu/system/linux-initrd.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 656afd1..c90b87c 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
-;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2017, 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -273,7 +273,10 @@ FILE-SYSTEMS."
(append-map (compose file-system-type-modules file-system-type)
file-systems))
-(define* (default-initrd-modules #:optional (system (%current-system)))
+(define* (default-initrd-modules
+ #:optional
+ (system (or (%current-target-system)
+ (%current-system))))
"Return the list of modules included in the initrd by default."
(define virtio-modules
;; Modules for Linux para-virtualized devices, for use in QEMU guests.