From d4ee8de2140d50034d160c9dd49c18035a01dd2b Mon Sep 17 00:00:00 2001 From: Yelninei Date: Sun, 11 Jan 2026 12:33:53 +0000 Subject: [PATCH] system: hurd: Remove %hurd64-default-* variants. Since 8f852885de485098812450711e81c1f446d3acb6 these are aliases. * gnu/system/hurd.scm (%hurd64-default-operating-system, %hurd64-default-operating-system-kernel): Delete variables. * gnu/system/images/hurd.scm (hurd64-barebones-os): Replace %hurd64-default-operating-system with %hurd-default-operating-system * gnu/system/examples/bare-hurd64.tmpl (%hurd64-os): Same. * gnu/tests/virtualization.scm (%childhurd64-os): Remove usage of %hurd64-default-operating-system-kernel. Merges: #5544. Change-Id: Ie7345cd99dc37712e7a0f7683ad738c194c70fa7 --- gnu/system/examples/bare-hurd64.tmpl | 2 +- gnu/system/hurd.scm | 9 --------- gnu/system/images/hurd.scm | 2 +- gnu/tests/virtualization.scm | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/system/examples/bare-hurd64.tmpl b/gnu/system/examples/bare-hurd64.tmpl index 8d99dffa77..5cb04c2d0f 100644 --- a/gnu/system/examples/bare-hurd64.tmpl +++ b/gnu/system/examples/bare-hurd64.tmpl @@ -32,7 +32,7 @@ (define %hurd64-os (operating-system - (inherit %hurd64-default-operating-system) + (inherit %hurd-default-operating-system) (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader) (targets '("/dev/sdX")))) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index fa63a8cbef..96aeed37dc 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -52,8 +52,6 @@ %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: @@ -66,9 +64,6 @@ (define %hurd-default-operating-system-kernel gnumach) -(define %hurd64-default-operating-system-kernel - %hurd-default-operating-system-kernel) - (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' @@ -144,8 +139,4 @@ (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 0aba57d2f3..ba223b1e0c 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -71,7 +71,7 @@ (define hurd64-barebones-os (operating-system - (inherit %hurd64-default-operating-system) + (inherit %hurd-default-operating-system) (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader) (targets '("/dev/sdX")))) diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index 05b2e0748b..4a4daa0f91 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -295,7 +295,6 @@ (type 'hurd64-qcow2) (os (operating-system (inherit %hurd-vm-operating-system) - (kernel %hurd64-default-operating-system-kernel) (kernel-arguments '("noide")) ;use rumpdisk (users (cons (user-account (name "test")