From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cL6eI13fQmcJYwAAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:10:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id cL6eI13fQmcJYwAAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 09:10:05 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=FJR9EWGP; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kZ3DVapJ; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435805; a=rsa-sha256; cv=none; b=sr82DhMxsQO9VxCPWyhhFIjpMMtV46PoAA6/XehYouz3pmcK/fAe5L9gZkwBW+QZ8/XMwy tHFHxj/GGTNmuujvJr1VVzqcU/puLvpm8Wmz3Ie24sRmNt7hvx8Q4CkGPSrPL/ckOTYCVJ UOmI7Bz/oercnAK+mvM/7q5YS8+3gIut8Y1ON8RVuiIjRJSTyYHVIttXX6wENvgnbtmuAo /jlrEtqCWvfjcH0W13DgGdxRzid0txOTp2sGyd01Dn1753SXbAtNMkGS2SHnQuX1bT+kdN OGxvPaHgRcF9m69T3PYkpBl23qIdkNiqNcmAm28dbWTLqnUNyWtQsUwbf4Zsew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=FJR9EWGP; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kZ3DVapJ; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732435805; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=PgIbZ0X3WOZ5eK7ThU6oEqhz6MVJdVkzEuk5mN1bAX4RMbOOS4wOOJfztUVcopsza21hqU te1QOABF88pVKho9+hPh9dyIauWKXOxVb12jnsgB0y4qgrDWj4NvqiU7+CNHfMrB5/U/21 EczSiP1z0byjULelSMfp2LjqDylgDtSCIf4XT+PWMMxfr4Xpoj5LzSN9SnlLo3i2PrPagQ 7dCuzGLCeZxHn5WBpbjaTWC/jLuFRHrH7Ar4YEVFkGrdcg7SlOXJ/OxjQk1thgkSNu9rf7 bBGXy1Mg0ByvsK02yYmz8FYC0v8ZNQDlK188m/8oGSrgp9Eam/rliU1ykiPzHw== 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 2A9D13CF3 for ; Sun, 24 Nov 2024 09:10:04 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VI-0000kS-Ad; Sun, 24 Nov 2024 02:58:00 -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 1tF7Us-0000V0-RQ for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:36 -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 1tF7Ur-0002Rv-4k for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=FJR9EWGP6Yb0VtI9IF9Oadkqdb/G6n5Oz4txTILQ3knARR95gNV+5pUB722E7hTUcMwUVW+DEAMZTjIMw4O7cWZZKNCoH2zjO+nQAf7gpFk/0qxXCn9UzdIFY3s4jkL6bTokfAcSMOn2ECPNjGD+PRR3UUhvuQpZS/sj6B5sAQYdmK6E0aBY36iLe5E8R/H9VMMFYEZoUY/8Ya5zWqKMYiloVyQhsyDhA38nmKnWkJhWgsTY8OusgSIAA8YVwQtalU14hSeyN+Qs/y94ROBcnBMjCQB/sfNUo5Tditu5lr3+uHs8V8pYJ/BILdSyqPpI+p4bFRmJlduKXq1+Fmz5YA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ur-0004oc-0Z for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:33 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 51/58] system: examples: Add devel-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:32 +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.173243504518354 (code B ref 74290); Sun, 24 Nov 2024 07:57:32 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:25 +0000 Received: from localhost ([127.0.0.1]:60894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ui-0004li-9E for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UE-0004dC-Cy for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:55 -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 1tF7U9-0002Ic-6i; Sun, 24 Nov 2024 02:56:49 -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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=kZ3DVapJ/nMJsqzkWbnv 9eoygZpYwolsjXr/zA++TL6eO9/cfLL1haQB3Pkjzt3h0rGdsRL33XzLsLPi+FXm0yMU52i/bP9iV 0gw8r+Chhlu9CXbYaMPKe3oq1LraFqSZyOy2nkQkjHXOXncXQ1tAF1vNoEGRw94+Tn7tu0X3kP4a/ EDL5UzIIumLBoknyhFt1AuHw+ICHmsMCbjaimoqZPU5HIgNUzazuQ8geube7R/vwL1VF2HsNH57lG o906HAI4UB1wwafKKKQgOVZNS/MFS1L5B/UXUVzZ7KPo5rj7qJckCmrSiYHekappwzMpraqyN+wiD 1P0BKZek/wNMsg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: -1.83 X-Spam-Score: -1.83 X-Migadu-Queue-Id: 2A9D13CF3 X-Migadu-Scanner: mx12.migadu.com X-TUID: 0TwswYa1PYYM This also updates comments and removes the comment about a very old `bootstrap-profile' hack. * gnu/system/examples/devel-hurd.tmpl (hurd-packages): New variable (%hurd-devel-os): Use it. * gnu/system/examples/devel-hurd64.tmpl: New file. Change-Id: I54b6b0843f0dd635d89cca483ae43d23b20d21e8 --- gnu/system/examples/devel-hurd.tmpl | 70 +++++++++++---------------- gnu/system/examples/devel-hurd64.tmpl | 65 +++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 42 deletions(-) create mode 100644 gnu/system/examples/devel-hurd64.tmpl diff --git a/gnu/system/examples/devel-hurd.tmpl b/gnu/system/examples/devel-hurd.tmpl index 3dca0706d1..066bdfe9d8 100644 --- a/gnu/system/examples/devel-hurd.tmpl +++ b/gnu/system/examples/devel-hurd.tmpl @@ -3,7 +3,7 @@ ;; This is an operating system configuration template for a "bare bones ;; development" setup, with no X11 display server. -;; To build a disk image for a virtual machine, do +;; To build a disk image for a virtual machine, do something like: ;; ;; ./pre-inst-env guix system image --image-type=hurd-qcow2 --image-size=6G \ ;; --no-offload gnu/system/examples/devel-hurd.tmpl @@ -11,41 +11,38 @@ ;; You may run it like so ;; ;; cp /gnu/store/.../disk-image devel-hurd.img -;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 4096 \ -;; -device rtl8139,netdev=net0 \ -;; -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ -;; -hda devel-hurd.img -;; -;; and use it like +;; guix shell qemu -- qemu-system-i386 -m 4096 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --hda devel-hurd.img ;; ;; ssh -p 10022 root@localhost ;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' ;; -;; or even (if you use --image-size=3G) +;; or even: ;; ;; guix build hello ;; -;; Building Guix, do something like: +;; For Guix hacking, do something like: ;; -;; GUIX_PROFILE=/run/current-system/bootstrap-profile -;; source $GUIX_PROFILE/etc/profile +;; guix shell --boostrap -D guix ;; mkdir -p ~/src/guix ;; cd src/guix ;; git clone https://git.savannah.gnu.org/git/guix.git master ;; cd master ;; ./bootstrap -;; ./configure --with-courage +;; ./configure ;; make +(include "bare-hurd.tmpl") + (use-modules (srfi srfi-1) (ice-9 match) - (gnu) (gnu system hurd) - (gnu system locale) (guix packages) - (guix store) - (guix utils)) -(use-service-modules ssh virtualization) + (guix store)) + (use-package-modules base compression file gawk gdb hurd less m4 package-management ssh version-control) @@ -64,23 +61,23 @@ ;; These are not essential and do not build yet. '("graphviz" "guile-avahi" "po4a")))) +(define hurd-packages + (filter-map input->package + (fold alist-delete (package-direct-inputs hurd) + ;; These are not essential, rumpkernel is very big. + '("dde-sources" "parted" "rumpkernel" "util-linux" + "texinfo")))) + (define %hurd-devel-os (operating-system - (inherit %hurd-vm-operating-system) - (host-name "guixydevel") + (inherit %hurd-os) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")) + (timeout 0))) (timezone "Europe/Berlin") - (file-systems (cons (file-system - (device (file-system-label "hurd")) - (mount-point "/") - (type "ext2")) - %base-file-systems)) (swap-devices (list (swap-space (target "/swapfile")))) - (users (cons (user-account - (name "guix") - (group "users") - (supplementary-groups '("wheel"))) - %base-user-accounts)) (packages (cons* gdb-minimal git-minimal @@ -89,18 +86,7 @@ openssh-sans-x (append guix-packages - %base-packages/hurd))) - (services (cons* - (modify-services (operating-system-user-services - %hurd-vm-operating-system) - (openssh-service-type - config => - ;; Set wide open - (openssh-configuration - (openssh openssh-sans-x) - (port-number 2222) - (permit-root-login #t) - (allow-empty-passwords? #t) - (password-authentication? #t)))))))) + hurd-packages + %base-packages/hurd))))) %hurd-devel-os diff --git a/gnu/system/examples/devel-hurd64.tmpl b/gnu/system/examples/devel-hurd64.tmpl new file mode 100644 index 0000000000..146a35adcf --- /dev/null +++ b/gnu/system/examples/devel-hurd64.tmpl @@ -0,0 +1,65 @@ +;; -*-scheme-*- + +;; This is an operating system configuration template +;; for a "bare bones" QEMU setup, with no X11 display server. + +;; To build a disk image for a virtual machine, do: +;; +;; ./pre-inst-env guix system image --image-type=hurd-qcow2 --image-size=6G \ +;; --no-offload gnu/system/examples/devel-hurd64.tmpl +;; +;; You may run it like so: +;; +;; cp /gnu/store/.../disk-image devel-hurd.img +;; guix shell qemu@7 -- qemu-system-x86_64 -m 4096 \ +;; --machine q35 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --hda devel-hurd.img +;; +;; and use it like: +;; +;; ssh -p 10022 root@localhost +;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' +;; +;; or even: +;; +;; guix build hello +;; +;; For Guix hacking, do something like: +;; +;; guix shell --boostrap -D guix +;; mkdir -p ~/src/guix +;; cd src/guix +;; git clone git clone git://git.savannah.gnu.org/guix +;; cd master +;; ./bootstrap +;; ./configure +;; make + +(include "devel-hurd.tmpl") +(include "bare-hurd64.tmpl") + +(define %hurd64-devel-os + (operating-system + (inherit %hurd64-os) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")) + (timeout 0))) + (timezone "Europe/Berlin") + (swap-devices (list (swap-space + (target "/swapfile")))) + (packages (cons* + gdb-minimal-15 + git-minimal + gnu-make + m4 + openssh-sans-x + (append + guix-packages + hurd-packages + %base-packages/hurd))))) + +%hurd64-devel-os -- 2.46.0