From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cGLAEso6zl4HIgAA0tVLHw (envelope-from ) for ; Wed, 27 May 2020 10:02:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aMyPDso6zl71dQAAB5/wlQ (envelope-from ) for ; Wed, 27 May 2020 10:02:50 +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 8915A94029E for ; Wed, 27 May 2020 10:02:49 +0000 (UTC) Received: from localhost ([::1]:45888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdstb-00020Y-DG for larch@yhetil.org; Wed, 27 May 2020 06:02:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdsss-0001Q2-P8 for bug-guix@gnu.org; Wed, 27 May 2020 06:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdsss-0003EU-Fq for bug-guix@gnu.org; Wed, 27 May 2020 06:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jdsss-0007cR-Dp for bug-guix@gnu.org; Wed, 27 May 2020 06:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41541: merge wip-hurd-vm Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 27 May 2020 10:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41541 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Jan Nieuwenhuizen Received: via spool by 41541-submit@debbugs.gnu.org id=B41541.159057369729256 (code B ref 41541); Wed, 27 May 2020 10:02:02 +0000 Received: (at 41541) by debbugs.gnu.org; 27 May 2020 10:01:37 +0000 Received: from localhost ([127.0.0.1]:48331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdssT-0007bo-70 for submit@debbugs.gnu.org; Wed, 27 May 2020 06:01:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdssS-0007bc-17 for 41541@debbugs.gnu.org; Wed, 27 May 2020 06:01:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34352) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdssM-0002f1-0I; Wed, 27 May 2020 06:01:30 -0400 Received: from [2a01:e0a:fa:a50:e5a2:3f70:d249:6ce9] (port=34496 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jdssJ-0006uH-Uw; Wed, 27 May 2020 06:01:29 -0400 From: Mathieu Othacehe References: <87o8qavktf.fsf@gnu.org> Date: Wed, 27 May 2020 12:01:25 +0200 In-Reply-To: <87o8qavktf.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Tue, 26 May 2020 16:21:16 +0200") Message-ID: <87tv01vgqy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 41541@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: aefm1zqDOF2L --=-=-= Content-Type: text/plain Hello Jan, That's a good summary of the (complex) situation, thank you! > Mattieu is looking into cleaning up of > > b605a36031 * origin/wip-hurd-vm WIP hurd-directives About that, I'd like to limit at maximum the (if hurd ...) conditionals in (gnu system image). So for the "make-device-node", I would propose to "link" it to the image definition, as proposed in the attached patch. I'll see if we can do something similar for the "extra-directives" and the "boot-activation". Thanks, Mathieu --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-hurd-nodes.patch >From 371f2bab466cef53f66ac69927014278055572fc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 27 May 2020 10:56:13 +0200 Subject: [PATCH] hurd nodes --- gnu/build/image.scm | 5 +++++ gnu/system/image.scm | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 087e2c78d9..d0722616f2 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -157,6 +157,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." references-graphs (register-closures? #t) system-directory + (make-device-nodes + make-essential-device-nodes) #:allow-other-keys) "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to install the bootloader configuration. @@ -168,6 +170,9 @@ of the directory of the 'system' derivation." (populate-root-file-system system-directory root) (populate-store references-graphs root) + ;; Populate /dev. + (make-device-nodes root) + (when register-closures? (for-each (lambda (closure) (register-closure root diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 03588f7d38..67e560891b 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -89,6 +89,13 @@ (flags '(boot)) (initializer (gexp initialize-root-partition)))) +(define hurd-initialize-root-partition + #~(lambda* (#:rest args) + (apply initialize-root-partition + (append args + (list #:make-device-nodes + make-hurd-device-nodes))))) + (define hurd-disk-image (image (format 'disk-image) @@ -99,7 +106,7 @@ (label root-label) (file-system "ext2") (flags '(boot)) - (initializer (gexp initialize-root-partition))))))) + (initializer hurd-initialize-root-partition)))))) (define efi-disk-image (image @@ -154,12 +161,14 @@ (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build image) + (gnu build linux-boot) (guix store database)) #:select? not-config?) ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu build vm) (gnu build image) + (gnu build linux-boot) (guix store database) (guix build utils)) gexp* ...)))) -- 2.26.2 --=-=-=--