From patchwork Fri Apr 12 13:15:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 3276 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0842616E5C; Fri, 12 Apr 2019 14:26:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 93FD616DEE for ; Fri, 12 Apr 2019 14:26:26 +0100 (BST) Received: from localhost ([127.0.0.1]:37305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwCI-0005Ul-5O for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:26:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000201-Ev for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-00057M-EA for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3E-00052u-JZ for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3E-0003MN-E5 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507497912802 (code B ref 35244); Fri, 12 Apr 2019 13:17:04 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:19 +0000 Received: from localhost ([127.0.0.1]:55627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2T-0003KD-2G for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:18 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:53072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2O-0003JJ-Fx for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:13 -0400 Received: by mail-wm1-f48.google.com with SMTP id a184so11202839wma.2 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tY7JsMUT2twM0z4e6sQsusf8r5hedkxppnh4WWh3EOM=; b=uBUwccW2fAg6wZjeucIuVAGqmTvhCM99PhgAqo32jmKG5XRodqeRUllCHwPzPGJUXx cuLHgctRZ3zkTyrep1G7f37jZgOS7Ob5gWcKXq7qIivwn/xIS37MJubpo497K2zn8rDk Vx50rpyuopfbey3S1QzOS8/l6cpfxw6jINdk7xbfHsb1mudb1snzMLV0EPdFhwnTZ06y cnQIIbphM0LspYgELBQC6p7WMA8N8snxKZmk2dPOhs2rzrCX3RQd6xngFXB1iZNt3at9 MqIFJwVUebiLamj06nQQQUANX64oRDT3rgD46KLvV2ZlMmhu7u53nOVVhzVtcsgTjX4R /MCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tY7JsMUT2twM0z4e6sQsusf8r5hedkxppnh4WWh3EOM=; b=gTdyzvjDiqLDYX3wjcYCOR1aF90cxiAEg3wUTEJxhagJUhmfgMf7bIgmRBitHDE73e qLJ+UOMbQ5cN40HiiJSFWLsgKnhbDupYJCSYUziNdgxIviRPWQ5YcdTMDIW0/OypCR5P Pqr4qsANVq2wUHbd8aM/eGW/bdgJD4kf65xIJ+K2qQD7TpLFY3hmGapQx/cjKKZp7hm4 ka2eLLGK6QHLzrprZFwx3cRfh3tekXNkXeePIav3Wpor2FEXjvBXJCJ4gZtFokzha41A FkvL9a44NdG82u1XBw3yiXDGgCVGNGEkxxYNnDWu0KqYByyAcco9zUKGcgiZKuiEb3vd N1bA== X-Gm-Message-State: APjAAAVXZhk1gfNL4Q/vo0gcCCL9ZKytBHLAtZ6VBKimDOjRmDbSFtXN 3B8hXSCmK3jCzkdBCntu+59Xh4BP X-Google-Smtp-Source: APXvYqzj+eaeKy0bDd19tQhC0wL/IVPOZEe9YfyyqGsfNh+wQcSz5Rv3ov/NHdZhmeV6nx2WHAg0cw== X-Received: by 2002:a1c:a9d4:: with SMTP id s203mr10654019wme.117.1555074966581; Fri, 12 Apr 2019 06:16:06 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:05 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:55 +0200 Message-Id: <20190412131556.25282-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; ;;; 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.