nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mathieu Othacehe 2019-03-06 11:28:53 +01:00
parent d8dbfbce60
commit fdbf4447bc
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/system/linux-initrd.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -273,7 +273,10 @@ FILE-SYSTEMS."
(append-map (compose file-system-type-modules file-system-type) (append-map (compose file-system-type-modules file-system-type)
file-systems)) 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." "Return the list of modules included in the initrd by default."
(define virtio-modules (define virtio-modules
;; Modules for Linux para-virtualized devices, for use in QEMU guests. ;; Modules for Linux para-virtualized devices, for use in QEMU guests.