From patchwork Sun Nov 10 10:38:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33225 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 A4C6927BBEA; Sun, 10 Nov 2024 10:40:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4C11127BBE2 for ; Sun, 10 Nov 2024 10:40:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MT-0000v1-3U; Sun, 10 Nov 2024 05:40:05 -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 ) id 1tA5MR-0000so-Nt for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:03 -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 ) id 1tA5MR-0008Bp-FC for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:03 -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=/pIhBQFbHM3Hte7KNbqHtKa6WkH0OGOXfOnHnNHczww=; b=vQJc7hWG63rUEVE6N1iJQNmQsVPksoZHwuh2XM9xcrPOPuwdNO0ZlLas+lenBRdpCUpi0jwFQn0TDPD+CWVSAttJSkJ7GQi2F2uXGDcrLNla8TKv0TUifDIquAWzUmk+/uMxMXCDMVM+dPTsHeOYvqeXH7zmjAPzeJlYmquUFaDLi3dfoLcqpVfe+Azvjld+8wmJwHj4YeTFL3TpZtcQGVIfdHxxKQo8WJbfwa7U3kxWdiE8I8Km+e9I6zKfa6TDhbCwD5CQIcepK0edPf0wbpUldlu5QGEFjhexTik4ixlNgiErtCVJ2QunmP7YK5zWsL1NA7oMXl7bargA8Fbosg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MR-0002hl-9Y for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 15/31] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:03 +0000 Resent-Message-ID: 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.173123516010171 (code B ref 74290); Sun, 10 Nov 2024 10:40:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:20 +0000 Received: from localhost ([127.0.0.1]:55769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lj-0002dv-Vx for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LS-0002YX-Jp for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:04 -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 ) id 1tA5LN-0007pZ-Da; Sun, 10 Nov 2024 05:38:57 -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=/pIhBQFbHM3Hte7KNbqHtKa6WkH0OGOXfOnHnNHczww=; b=i5TbD8+FsI+swv5s9TkB TwXTQNQxSAeoBVtwc/P2ptXfBVQaV/RqPAFxPGuAV6+UXHTngi+UhdiECCyVSb0Z7wJK+oJUBu6c/ OsQAfVLghMF+VB5ZsbtcT8uqP5KsXhDpG+EJpttJgzLlc/v/uJfwSDJm7iVMGc/7CIpex8upzQosi T1Yu6vjvwwwTwhyQBWysnEg/f3SDSwnJdwS2LpMRJPvPlWHhAqn0xSBkeD6rj/jg4HGbpuR7pV5IR xY9uBMaNi4YE3AfXu8cyZEq5LkG0dh/ELg59yEAB4x84TcX/nWo5xB1unhcontzdImZNhVMTEmPQZ yl/7vuxnlzYxJg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:11 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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. Change-Id: I68834a4c5c18b0e154d06082824008d13ca52214 --- gnu/system/images/hurd.scm | 47 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 01c422a54f..75f255ed94 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 -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +36,13 @@ (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-disk-image + hurd6-image-type + hurd64-qcow2-image-type + hurd64-barebones-disk-image + hurd64-barebones-qcow2-image)) (define hurd-barebones-os (operating-system @@ -115,5 +121,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 hurd-barebones-os x86_64-gnu + #:type hurd64-image-type)) + (name 'hurd64-barebones-disk-image))) + +(define hurd64-barebones-qcow2-image + (image + (inherit + (os+platform->image hurd-barebones-os x86_64-gnu + #:type hurd64-qcow2-image-type)) + (name 'hurd64-barebones.qcow2))) + ;; Return the default image. hurd-barebones-qcow2-image