From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EAkDKuTsyF6bEQAA0tVLHw (envelope-from ) for ; Sat, 23 May 2020 09:29:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2ALmJeTsyF5yAgAA1q6Kng (envelope-from ) for ; Sat, 23 May 2020 09:29:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2C105940980 for ; Sat, 23 May 2020 09:29:08 +0000 (UTC) Received: from localhost ([::1]:43716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcQSp-0000cc-3U for larch@yhetil.org; Sat, 23 May 2020 05:29:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcQSk-0000ZK-MJ for guix-patches@gnu.org; Sat, 23 May 2020 05:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcQSk-0000Os-Cx for guix-patches@gnu.org; Sat, 23 May 2020 05:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcQSk-0004e9-8y for guix-patches@gnu.org; Sat, 23 May 2020 05:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41350] [PATCH v2 3/3] system: vm: Build vm-image using native qemu, for the Hurd. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 09:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41350 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 41350@debbugs.gnu.org Received: via spool by 41350-submit@debbugs.gnu.org id=B41350.159022612417831 (code B ref 41350); Sat, 23 May 2020 09:29:02 +0000 Received: (at 41350) by debbugs.gnu.org; 23 May 2020 09:28:44 +0000 Received: from localhost ([127.0.0.1]:33431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcQSS-0004dW-8P for submit@debbugs.gnu.org; Sat, 23 May 2020 05:28:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcQSR-0004dI-1z for 41350@debbugs.gnu.org; Sat, 23 May 2020 05:28:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41012) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcQSL-0000NV-Q1; Sat, 23 May 2020 05:28:37 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=51072 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jcQSH-0003iM-LP; Sat, 23 May 2020 05:28:34 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200519072302.9202-1-janneke@gnu.org> <20200519072302.9202-3-janneke@gnu.org> <87blmkthg0.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sat, 23 May 2020 11:28:31 +0200 In-Reply-To: <87blmkthg0.fsf@gnu.org> (Mathieu Othacehe's message of "Tue, 19 May 2020 11:14:23 +0200") Message-ID: <87367r57b4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: 7CAuNAReETme Mathieu Othacehe writes: Hello Mathieu, >> + #$(if (hurd-target?) >> + #~#+(grub-root-search store-device font-file) >> + (grub-root-search store-device font-file)) >> + #$(if (hurd-target?) >> + #~#+(setup-gfxterm config font-file) >> + (setup-gfxterm config font-file)) > > I'm not certain that hurd-target? always return the expected answer > here. Now that we have let-system, the safer way to check for the target > system could be to write: > > #$(let-system (system target) > (hurd-target? system target)) Okay... > Ludo, is this correct? Furthermore, if you make sure that > "grub-root-search" and "setup-gfxterm" return #+, you could maybe drop > this part? ...used #+ and dropped the IFs here, but used this insight below. >> + >> + (loader #$(if (hurd-target?) #~#+loader loader)) >> + (linux #$(if (hurd-target?) >> + #~(string-append >> + #+linux "/" >> + #+(system-linux-image-file-name)) >> + #~(string-append >> + #$linux "/" >> + #$(system-linux-image-file-name)= ))) > > Same concern as above about "hurd-target?". ...Ah, that makes sense...that's of course why Ludo already introduced (define-syntax-rule (check predicate) (let-system (system target) (predicate (or target system)))) here. So, using "(check hurd-triplet?)", as Ludo was already doing in some other places here. >> + ;; (if #$(hurd-target?) >> + ;; '#+(append (list parted e2fsprogs dosfstools) >> + ;; (map canonical-package >> + ;; (list sed grep coreutils f= indutils gawk))) >> + ;; '#$(append (list parted e2fsprogs dosfstools) >> + ;; (map canonical-package >> + ;; (list sed grep coreutils findu= tils gawk)))) >> + ) > > Is this needed? Oops -- that was unfinished business; that IF did not work yet; possibly because of not going through LET-SYSTEM. This helps a lot, I'm now again able to do both ./pre-inst-env guix system vm-image --target=3Di586-pc-gnu --no-grafts = gnu/system/examples/bare-bones.tmpl ./pre-inst-env guix system vm-image gnu/system/examples/bare-bones.tmpl again! Phew... And that's also because I learned to include the full list of exported symbols in the autoload of (gnu store database). Mathieu, if it turns out that you are dropping qemu-image next week altogether then great!, and I have no problem whatsoever dropping this patch set as well. For now, I have reset wip-hurd-vm and put your commits towards the bottom of the wip-hurd-vm stack too. Sending an updated v3 patch set just because I'm so pleased with this result. Greetings, janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com