From: Mathieu Othacehe <m.othacehe@gmail.com>
To: 35244@debbugs.gnu.org
Cc: Mathieu Othacehe <m.othacehe@gmail.com>
Subject: [bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation.
Date: Fri, 12 Apr 2019 15:15:55 +0200 [thread overview]
Message-ID: <20190412131556.25282-5-m.othacehe@gmail.com> (raw)
In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com>
* 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 <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.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.
;;;
@@ -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
next prev parent reply other threads:[~2019-04-12 13:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 13:13 [bug#35244] [PATCH 0/6] Fix some cross-compilation issues Mathieu Othacehe
2019-04-12 13:15 ` [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation Mathieu Othacehe
2019-04-12 13:15 ` [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation Mathieu Othacehe
2019-04-14 15:22 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 3/6] gnu: glibc-utf8-locales: Always use native package Mathieu Othacehe
2019-04-14 15:24 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation Mathieu Othacehe
2019-04-14 15:26 ` Ludovic Courtès
2019-04-12 13:15 ` Mathieu Othacehe [this message]
2019-04-14 15:29 ` [bug#35244] [PATCH 5/6] linux-initrd: " Ludovic Courtès
2019-06-25 19:47 ` Mathieu Othacehe
2019-06-26 8:57 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 6/6] gnu: python: " Mathieu Othacehe
2019-04-14 15:27 ` Ludovic Courtès
2019-04-14 15:19 ` [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation Ludovic Courtès
2019-06-25 19:42 ` Mathieu Othacehe
2019-06-26 8:19 ` [bug#35244] [PATCH] gnu: perl: " Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190412131556.25282-5-m.othacehe@gmail.com \
--to=m.othacehe@gmail.com \
--cc=35244@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).