[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
32/38: system: image: Add hurd64 image types.
From: |
guix-commits |
Subject: |
32/38: system: image: Add hurd64 image types. |
Date: |
Thu, 7 Nov 2024 10:56:11 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit feec24ea37f26fc9235696bf1ef90420de3f63de
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Nov 5 23:38:41 2024 +0100
system: image: Add hurd64 image types.
* 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 <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,13 @@
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 @@
#: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
- 28/38: gnu: libxcrypt: Support the 64bit Hurd., (continued)
- 28/38: gnu: libxcrypt: Support the 64bit Hurd., guix-commits, 2024/11/07
- 37/38: gnu: pciutils: Support the 64bit Hurd., guix-commits, 2024/11/07
- 30/38: gnu: gcc-13, gcc-14: Support being used as parent for gcc-static., guix-commits, 2024/11/07
- 36/38: gnu: openssl-3.0: Support the 64bit Hurd., guix-commits, 2024/11/07
- 29/38: gnu: libstdc++: Support the 64bit Hurd., guix-commits, 2024/11/07
- 15/38: installer: Add dry-run?, guix-commits, 2024/11/07
- 11/38: installer: Align comments., guix-commits, 2024/11/07
- 23/38: gnu: bash-minimal: Fix build for 64bit Hurd., guix-commits, 2024/11/07
- 21/38: gnu: gcc: Add indirections current-gcc, current-gcc-toolchain., guix-commits, 2024/11/07
- 14/38: installer: Use `%' for parameter %run-command-in-installer., guix-commits, 2024/11/07
- 32/38: system: image: Add hurd64 image types.,
guix-commits <=
- 34/38: gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd., guix-commits, 2024/11/07