From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:49153)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i5UX8-0002zr-NN
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:37:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i5UX5-0000qu-6y
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:37:08 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:52159)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1i5UX0-0000oR-4U
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:37:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i5UWz-0004wW-Us
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:37:01 -0400
Subject: [bug#36477] [PATCH v3 45/48] system: vm: Add arm64 support.
Resent-Message-ID: <handler.36477.B36477.156760057418946@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <20190902153333.11190-1-m.othacehe@gmail.com>
 <20190902153333.11190-46-m.othacehe@gmail.com>
Date: Wed, 04 Sep 2019 14:36:01 +0200
In-Reply-To: <20190902153333.11190-46-m.othacehe@gmail.com> (Mathieu
 Othacehe's message of "Mon, 2 Sep 2019 17:33:30 +0200")
Message-ID: <87o90044su.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: 36477@debbugs.gnu.org

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> * gnu/build/vm.scm (load-in-linux-vm): Add target-arm64? argument and use=
 it
> to pass correct arguments to qemu.
> * gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass the new
> target-arm64? argument added above. Do not add ESP partition on all ARM
> targets. Do not pass grub-efi package to initialize-hard-disk on ARM targ=
ets.

[...]

> --- a/gnu/build/vm.scm
> +++ b/gnu/build/vm.scm
> @@ -82,6 +82,7 @@
>                             make-disk-image?
>                             single-file-output?
>                             target-arm32?
> +                           target-arm64?

Maybe we should just have a #:target parameter instead, WDYT?


[...]

> +                    (grub-efi #$@(if (target-arm?)
> +                                     '(#f)
> +                                     #~(#$grub-efi))))

Simply:  #$(and (not (target-arm?)) grub-efi).

Otherwise LGTM.

Ludo=E2=80=99.