From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id wErzGnA3PGdCbgAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 07:00:00 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id wErzGnA3PGdCbgAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:00:00 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=PM+PuqhY;
	dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=KNAouupe;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731999600;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=8+XO2/Y/zki6e5/erLaOt1be1Gkhyx2OptWpV7D/eZg=;
	b=IPENpS7sQVdlBjYzHxI0Y0/XJmodrkaUf3OrktprByzU/AcNIqRLp2E+mYclWsSrpUHXFT
	XWfKgSx6kr6EmrHIklg84U9NQytGRurVG0qMHFdbNrlIAOq95WaQ6Xe4celB3bxSoScNxh
	2vg90QcTY6Pj8NbakORG3z6LeGNBZvI7c/36dIbfWqIKTVShwrrRgTNv2hQnw4QLP8nNZ8
	5Yof8xpko4QTtfcvTAxVvVmPayBNH9uR1e/L1KRS1rEvrLwNCILpxyM9Tez8QcvJtjYs2m
	DFfMkLabBVMkdB+oBVQbZ/4E/3YO2UEyFGqFGl9kfzLk43ahnCpmJ86zymwipw==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731999600; a=rsa-sha256; cv=none;
	b=lJRbDzah+nKlJQwLsr5CUjpoQRNkcszsWls0MT2YUILg96LWxZkMt+7SXnmmHNdjgnmdIP
	lZi+9jY/W+F9tlrUzjhsqXp2pNkWrBIO40mFRwUsEvLA/pjSFTrQaEBx15Pgey/ke4877L
	pgrrazlHm3goEw6hDSip2t7VIX14yUa8lx15kBch8eaUaNwtMZMMK8cW2P6cTZQ7y+WQxe
	3VEzxd/nTRBB0A/rU8XtlBjRqYkhG4RB/bSwUTujj0zlpPjp3dSrsG06HLLaOTZFZ4Bpcn
	48BHSex7xE091vYghSn4NYGb7St9m8DJHHsI83Q6ePwXzyNS73V4DyPDeHMPAQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=PM+PuqhY;
	dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=KNAouupe;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
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 2A519794EE
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:00:00 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tDICo-0008S8-UO; Tue, 19 Nov 2024 01:59:23 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tDICm-0008QJ-2w
 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:20 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tDICl-0004LE-QZ
 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:19 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=PyhNVzNTCBqNggG0y5zxgIrF7PsKideagxLANCne5eQ=; 
 b=PM+PuqhY68Tv6+2vW8reOHY0yc9OwBwdYGYEGTm648UQyP5SCzem8Ide5V5M9RVqfgwEBY0u6YNTqrwyiU/bEwDrLbfSsVLoA+YvWwjS9OQxOEeAsP6O117j1fge6lsJyYKl3/ShbNNKDF+59n8vcSUC6WMzjwRP+Ejn4dEptiBbrf7J2nLw9MkHqMcVG+cehVG/QgytHneaVrhymZLI9fpgSvz3pKWreXbthxo93lqy/nopGOkLbHafnxKCCRbQicusCu9ahFIg1LHpolkjpQj0Jz8lLL8fOQIb7ewkfWvMlO+ScoIb4q0JzVX7a07t5ERfzQb8tBL9Dgnx+EEzrA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tDICl-0005J2-Gl
 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:19 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v3 27/51] system: image: Add hurd64 image types.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 19 Nov 2024 06:59:19 +0000
Resent-Message-ID: <handler.74290.B74290.173199954520113@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954520113
 (code B ref 74290); Tue, 19 Nov 2024 06:59:19 +0000
Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:05 +0000
Received: from localhost ([127.0.0.1]:40554 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tDICW-0005E2-6j
 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:05 -0500
Received: from eggs.gnu.org ([209.51.188.92]:39408)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tDIBz-00058w-MW
 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:32 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tDI9o-000419-Qn; Tue, 19 Nov 2024 01:56:16 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=PyhNVzNTCBqNggG0y5zxgIrF7PsKideagxLANCne5eQ=; b=KNAouupeZJpLvXdLlpx5
 zqwTCRy+00RyIuYBa6SabZdn04WfSLZf87ZeMdPVzjzx3NzV5gtUZb13Zk1bg7RxMkvk6TgGYCqgh
 yPh/JzA/MWdNG2nqpkNwq2gMW17RQiIVSVnI6J/W+BwAI5sgZZArYPKgNc2EbWdifdKIWx8NHPWXB
 Gkz9sPAxnLmRdcQpHAxP6SKJOn9jw8igpl7MK0Per/DSZktrtko6szfkxYmqQjLB5C75bD83da/oL
 aNsME62jwLOxuKflpaq4f2IGHNJYquRN8kD1cIimeTiKNYq6RoDdfBchiUNSMidmyhdMEPVNfZ/2L
 eK+HOxSWjSTn6g==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Nov 2024 07:54:57 +0100
Message-ID: <20f53327749d766cf31a35e0f1f3a5f9803843c6.1731999203.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731999202.git.janneke@gnu.org>
References: <cover.1731999202.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
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+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -4.83
X-Spam-Score: -4.83
X-Migadu-Queue-Id: 2A519794EE
X-Migadu-Scanner: mx13.migadu.com
X-TUID: X2DCoJtEIKg2

* gnu/system/hurd.scm (%hurd64-default-operating-system-kernel,
%hurd64-default-operating-system): New variables.
* gnu/system/images/hurd.scm (hurd64-disk-image, hurd64-image-type,
hurd64-qcow2-image-type, hurd64-barebones-disk-image,
hurd64-barebones-qcow2-image): New variables.

* gnu/system/images/hurd.scm (hurd64-barebones-os): New variable.
---
 gnu/system/hurd.scm        | 17 +++++++++
 gnu/system/images/hurd.scm | 72 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 9a351529e8..6263d3de71 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -18,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu system hurd)
+  #:use-module (ice-9 match)
   #:use-module (guix gexp)
   #:use-module (guix profiles)
   #:use-module (guix utils)
@@ -51,6 +52,8 @@ (define-module (gnu system hurd)
             %desktop-services/hurd
             %hurd-default-operating-system
             %hurd-default-operating-system-kernel
+            %hurd64-default-operating-system
+            %hurd64-default-operating-system-kernel
             %setuid-programs/hurd))
 
 ;;; Commentary:
@@ -68,6 +71,14 @@ (define %hurd-default-operating-system-kernel
                         (%current-target-system #f))
         gnumach)))
 
+(define %hurd64-default-operating-system-kernel
+  (if (system-hurd?)
+      gnumach
+      ;; A cross-built GNUmach does not work
+      (with-parameters ((%current-system "x86_64-linux")
+                        (%current-target-system #f))
+        gnumach)))
+
 (define %base-packages/hurd
   ;; Note: the Shepherd comes before the Hurd, not just because its duty is to
   ;; shepherd the herd, but also because we want its 'halt' and 'reboot'
@@ -142,3 +153,9 @@ (define %hurd-default-operating-system
     (essential-services (hurd-default-essential-services this-operating-system))
     (privileged-programs '())
     (setuid-programs %setuid-programs/hurd)))
+
+(define %hurd64-default-operating-system
+  (operating-system
+    (inherit %hurd-default-operating-system)
+    (kernel %hurd64-default-operating-system-kernel)))
+
diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm
index 01c422a54f..67815aeb9b 100644
--- a/gnu/system/images/hurd.scm
+++ b/gnu/system/images/hurd.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +36,14 @@ (define-module (gnu system images hurd)
             hurd-image-type
             hurd-qcow2-image-type
             hurd-barebones-disk-image
-            hurd-barebones-qcow2-image))
+            hurd-barebones-qcow2-image
+
+            hurd64-barebones-os
+            hurd64-disk-image
+            hurd6-image-type
+            hurd64-qcow2-image-type
+            hurd64-barebones-disk-image
+            hurd64-barebones-qcow2-image))
 
 (define hurd-barebones-os
   (operating-system
@@ -62,6 +69,30 @@ (define hurd-barebones-os
                               (password-authentication? #t)))
                     %base-services+qemu-networking/hurd))))
 
+(define hurd64-barebones-os
+  (operating-system
+    (inherit %hurd64-default-operating-system)
+    (bootloader (bootloader-configuration
+                 (bootloader grub-minimal-bootloader)
+                 (targets '("/dev/sdX"))))
+    (file-systems (cons (file-system
+                          (device (file-system-label "my-root"))
+                          (mount-point "/")
+                          (type "ext2"))
+                        %base-file-systems))
+    (host-name "guixygnu")
+    (timezone "Europe/Amsterdam")
+    (packages (cons openssh-sans-x %base-packages/hurd))
+    (services (cons (service openssh-service-type
+                             (openssh-configuration
+                              (openssh openssh-sans-x)
+                              (use-pam? #f)
+                              (port-number 2222)
+                              (permit-root-login #t)
+                              (allow-empty-passwords? #t)
+                              (password-authentication? #t)))
+                    %base-services+qemu-networking/hurd))))
+
 (define hurd-initialize-root-partition
   #~(lambda* (#:rest args)
       (apply initialize-root-partition
@@ -115,5 +146,42 @@ (define hurd-barebones-qcow2-image
                         #:type hurd-qcow2-image-type))
    (name 'hurd-barebones.qcow2)))
 
+
+;;;
+;;; 64bit Hurd
+;;;
+(define hurd64-disk-image
+  (image
+   (inherit hurd-disk-image)
+   (platform x86_64-gnu)))
+
+(define hurd64-image-type
+  (image-type
+   (name 'hurd64-raw)
+   (constructor (cut image-with-os hurd64-disk-image <>))))
+
+(define hurd64-qcow2-image-type
+  (image-type
+   (name 'hurd64-qcow2)
+   (constructor (lambda (os)
+                  (image
+                   (inherit hurd64-disk-image)
+                   (format 'compressed-qcow2)
+                   (operating-system os))))))
+
+(define hurd64-barebones-disk-image
+  (image
+   (inherit
+    (os+platform->image hurd64-barebones-os x86_64-gnu
+                        #:type hurd64-image-type))
+   (name 'hurd64-barebones-disk-image)))
+
+(define hurd64-barebones-qcow2-image
+  (image
+   (inherit
+    (os+platform->image hurd64-barebones-os x86_64-gnu
+                        #:type hurd64-qcow2-image-type))
+   (name 'hurd64-barebones.qcow2)))
+
 ;; Return the default image.
 hurd-barebones-qcow2-image
-- 
2.46.0