[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation. |
Date: |
Fri, 12 Apr 2019 15:15:55 +0200 |
* 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 656afd1ddb..c90b87c023 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.
--
2.17.1
- [bug#35244] [PATCH 0/6] Fix some cross-compilation issues., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 3/6] gnu: glibc-utf8-locales: Always use native package., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 6/6] gnu: python: Fix cross compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation.,
Mathieu Othacehe <=
- [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation., Ludovic Courtès, 2019/04/14