From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 6De5Ok78rmYlawEA62LTzQ:P1 (envelope-from ) for ; Sun, 04 Aug 2024 03:58:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6De5Ok78rmYlawEA62LTzQ (envelope-from ) for ; Sun, 04 Aug 2024 05:58:07 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Oin+tmWZ; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b="qrp1nZ/o"; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=KqTUwx5m; 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=1722743886; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=2L0WgXU8TKlg4VeOKHQ/XJPzAwWLjvCNhaSKNfXE+6Y=; b=o9clonAbG4vgaaHbaFc22Nu8zglkObRFOqOZZLUsJ6nhaR8HDdJnL3oCzRAf3HYnFTDOZA FZAhkWSd0XWLwpK5v9iNoMbDHCx4O4NDWPV0B9B6o/rHHokeaQu+Uw7AHU4hP3RWRWKbZq fI9TQiVjSCcW7WEmxZsuDlNfEXDl2kCEfJMcjSYvPhn0x4JNcvdkjY9AgM++cP3CEggISu 6vU2BRmlbRQxphfzfbhMhGUPZazhU5D+0og76HnAtPF4d+YK6A0k87cFxqxD2ongibHtud LfU/6rQ7ZjvYlWgStWbqVRnP3cCd1MIKxsAsiIPXy8ecYrrD+hgwhQ1akXWtKA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Oin+tmWZ; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b="qrp1nZ/o"; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=KqTUwx5m; 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-Seal: i=1; s=key1; d=yhetil.org; t=1722743886; a=rsa-sha256; cv=none; b=Zk9gM0avQqw3vhXe9mwjruVHD1ielp9fgObyZ88q7az2gcLohDl7st5BD9doyZGucCIxCT hbH97KH5DAYF8dfS0IgYBH4GlLI1FgNBvjYtlqioc5L1MRMrjQxktG/Y8D8rwbSbfRQfM6 a2Euw3j8r5dwHZAbacfAw5tZoVzyifF3I6Srj/4lOcw5GfNfttrs9HV1rWjoJWsHCb4nCs A8B+CfRi+HERPTL4Go81OT8hEtDmOgiJZsJsHGt9Km/Z0+0FfD14Ig0s/TNw7J0Fans2Hd 74P1fq5ukU6Is35Mi6VEh9AuIeS8KQ4lPZufC3G5bz9Q1kQpB8bYW/mHQEBovA== 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 B3D78731C4 for ; Sun, 4 Aug 2024 05:58:06 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saSNT-0007nF-02; Sat, 03 Aug 2024 23:57:51 -0400 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 1saSNS-0007n0-Ah for guix-patches@gnu.org; Sat, 03 Aug 2024 23:57:50 -0400 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 1saSNS-0004IC-0B; Sat, 03 Aug 2024 23:57:50 -0400 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=2L0WgXU8TKlg4VeOKHQ/XJPzAwWLjvCNhaSKNfXE+6Y=; b=Oin+tmWZXB3AXgPU+Fy/gY4dDJeqzT3UZJvSDLqaa5Z1EQD5feTjbW3/pf3vw820HHZ3HxJ0EyplbsjrrZjrazdPEwf3Kr0I9hZyB3UqCpJvSqmlc5doq6lUbefyCM/1/UEUYp0pgpRG5a9SE28bMF6+63/rqQLZkK8x2Z1J//T2g5uv8zJt/Qn7qP3suTLqktr2ikrfJDiVYAbWCfYp7EE2Jnr5caeO9A6/2sL1G1xsNLwGQ4f+AnpvNj07zrbJ2oiWssDhVE6s3i7AQLYYyY6RL1sKO9/wz81ONV4hWIqvcGT1tMMfvu0wy0uXV094btifHsQV1aJWKtBUd8b/lw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saSNg-0001Ov-JD; Sat, 03 Aug 2024 23:58:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH 12/15] gnu: system: Update examples. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 03:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72457 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72457@debbugs.gnu.org Cc: Lilah Tascheter , Florian Pelz , Ludovic Court??s , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic Court??s , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.17227438365179 (code B ref 72457); Sun, 04 Aug 2024 03:58:04 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 03:57:16 +0000 Received: from localhost ([127.0.0.1]:55183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saSMu-0001LR-1d for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:57:16 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:58158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saSMq-0001K4-Re for 72457@debbugs.gnu.org; Sat, 03 Aug 2024 23:57:14 -0400 DKIM-Signature: a=rsa-sha256; b=qrp1nZ/oVVg2JQXd9ZmPW6izTMGYLeP2Sy5eMRrsad3Ko61Zo17lCGIIpEhxtC0rb2I7F0fIVczK3GueQQyrhpE0HiOcHcIxah/i6UZlyLtoC1931xnvNAoUSST/6bto2EkPxrWsH51yWAS1hzGtZh/iguUVmFw9J5WRvrbNRsbTOfY/tvQgko/hdE5Fi0+rri27IPNVdhdoMtqM6MvZptTepowH1b4DFmxL4NWzaez/Oxj5NkQVwljz+k19cPA4J2/PbI230GBY6F2TzkVvjP+BOCkKvdKBPL3DEHPx7eUC/JPnpYHnfiYNHnlLW+xvz5VoCeI4Wl4eWN4qvFbd7A==; s=purelymail2; d=lunabee.space; v=1; bh=zb7HPmkptVp0Va/5kW9G9MABNmNK8JtgYqJZZQ8Xi7k=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=KqTUwx5mvI022j91/jEQV9e+JJQdMSt2Df6AuMqsUCDbeeS/1TgkzmrNl+0TyHQmRLAX928DR+YUpSUhrdqbts3/6vVctkUS+LE6Z4xRJl2gqotLINCQP5U5I4+Z4BGOGdecrdruzP1bznOlbPe8hJM36/djDEWq7DAj0isgdkWBKGg2VmzWyxG9dRxq9xnur8oAtpQ3eYOBlmG9D00jXE8bek03WcEuwINlrARSo0sN1T0IqPgFvfdukFVAY9B4rRMLTyCE66J87FN7f6EL2cVAOMII8peCcZvsgt6S99lP5bNATgIppoXRtqvguXKhH8l0YLBoXGBHJhAgilMNxQ==; s=purelymail2; d=purelymail.com; v=1; bh=zb7HPmkptVp0Va/5kW9G9MABNmNK8JtgYqJZZQ8Xi7k=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 72457@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1753051598; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 03:56:26 +0000 (UTC) Date: Sat, 3 Aug 2024 22:55:32 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail 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: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -5.44 X-Migadu-Queue-Id: B3D78731C4 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.44 X-TUID: vEoe+EWBWwlM * gnu/system/examples/asus-c201.tmpl (bootloader): Use new depthcharge bootloader name scheme and update to new target system. * gnu/system/examples/bare-bones.tmpl (bootloader), gnu/system/examples/bare-hurd.tmpl (bootloader), gnu/system/examples/beaglebone-black.tmpl (bootloader), gnu/system/examples/desktop.tmpl (bootloader), gnu/system/examples/lightweight-desktop.tmpl (bootloader), gnu/system/examples/plasma.tmpl (bootloader), gnu/system/examples/raspberry-pi-64-nfs-root.tmpl (bootloader), gnu/system/examples/raspberry-pi-64.tmpl (bootloader): Use new target sys= tem. * gnu/system/examples/docker-image.tmpl (bootloader): Delete. * gnu/system/examples/vm-image.tmpl (bootloader): Use auto image target. Change-Id: I3675f17ae9cd94cff99328762600fb4e491bc9f2 --- gnu/system/examples/asus-c201.tmpl | 6 +++-- gnu/system/examples/bare-bones.tmpl | 7 ++++-- gnu/system/examples/bare-hurd.tmpl | 4 +++- gnu/system/examples/beaglebone-black.tmpl | 6 +++-- gnu/system/examples/desktop.tmpl | 4 +++- gnu/system/examples/docker-image.tmpl | 6 ++--- gnu/system/examples/lightweight-desktop.tmpl | 4 +++- gnu/system/examples/plasma.tmpl | 4 +++- .../examples/raspberry-pi-64-nfs-root.tmpl | 23 ++++++++++++------- gnu/system/examples/raspberry-pi-64.tmpl | 18 ++++++++------- gnu/system/examples/vm-image.tmpl | 5 ++-- 11 files changed, 54 insertions(+), 33 deletions(-) diff --git a/gnu/system/examples/asus-c201.tmpl b/gnu/system/examples/asus-= c201.tmpl index 019111c167..eec185eebf 100644 --- a/gnu/system/examples/asus-c201.tmpl +++ b/gnu/system/examples/asus-c201.tmpl @@ -14,8 +14,10 @@ ;; Assuming /dev/mmcblk0p1 is the kernel partition, and ;; "my-root" is the label of the target root file system. (bootloader (bootloader-configuration - (bootloader depthcharge-bootloader) - (targets '("/dev/mmcblk0p1")))) + (bootloader depthcharge-veyron-speedy-bootloader) + (targets (list (bootloader-target + (type 'part) + (device "/dev/mmcblk0p1")))))) =20 ;; The ASUS C201PA requires a very particular kernel to boot, ;; as well as the following arguments. diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare= -bones.tmpl index 7b6a4b09b0..9eed05f2e0 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -13,10 +13,13 @@ =20 ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the ;; target hard disk, and "my-root" is the label of the target - ;; root file system. + ;; root file system. If you're just building an image, the + ;; 'targets' field may be omitted. (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) ;; It's fitting to support the equally bare bones =E2=80=98-nographic=E2= =80=99 ;; QEMU option, which also nicely sidesteps forcing QWERTY. (kernel-arguments (list "console=3DttyS0,115200")) diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-= hurd.tmpl index 463c7ee798..8dd700cd9d 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -32,7 +32,9 @@ (inherit %hurd-default-operating-system) (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/system/examples/beaglebone-black.tmpl b/gnu/system/example= s/beaglebone-black.tmpl index 18bbb2723c..99963ef2fe 100644 --- a/gnu/system/examples/beaglebone-black.tmpl +++ b/gnu/system/examples/beaglebone-black.tmpl @@ -11,11 +11,13 @@ (timezone "Europe/Berlin") (locale "en_US.utf8") =20 - ;; Assuming /dev/mmcblk1 is the eMMC, and "my-root" is + ;; Assuming /dev/mmcblk1 is the eMMC. and "my-root" is ;; the label of the target root file system. (bootloader (bootloader-configuration (bootloader u-boot-beaglebone-black-bootloader) - (targets '("/dev/mmcblk1")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/mmcblk1")))))) =20 ;; This module is required to mount the SD card. (initrd-modules (cons "omap_hsmmc" %base-initrd-modules)) diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop= .tmpl index 2d65f22294..30dbdeea31 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -20,7 +20,9 @@ ;; Partition mounted on /boot/efi. (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))) (keyboard-layout keyboard-layout))) =20 ;; Specify a mapped device for the encrypted root partition. diff --git a/gnu/system/examples/docker-image.tmpl b/gnu/system/examples/do= cker-image.tmpl index 7123917af4..6d3114a0bc 100644 --- a/gnu/system/examples/docker-image.tmpl +++ b/gnu/system/examples/docker-image.tmpl @@ -9,6 +9,8 @@ (timezone "Europe/Berlin") (locale "en_US.utf8") =20 + ;; Bootloader can be left blank! + ;; This is where user accounts are specified. The "root" account is ;; implicit, and is initially created with the empty password. (users (cons (user-account @@ -34,10 +36,6 @@ ;; similar services for us. =20 ;; This will be ignored. - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets '("does-not-matter")))) - ;; This will be ignored, too. (file-systems (list (file-system (device "does-not-matter") (mount-point "/") diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/exam= ples/lightweight-desktop.tmpl index c061284ba8..0964238cb0 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -17,7 +17,9 @@ ;; Partition mounted on /boot/efi. (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")))) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))))) =20 ;; Assume the target root file system is labelled "my-root", ;; and the EFI System Partition has UUID 1234-ABCD. diff --git a/gnu/system/examples/plasma.tmpl b/gnu/system/examples/plasma.t= mpl index c3850ffe37..a81916ffe9 100644 --- a/gnu/system/examples/plasma.tmpl +++ b/gnu/system/examples/plasma.tmpl @@ -15,7 +15,9 @@ ;; is the label of the target root file system. (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) =20 (file-systems (cons (file-system (device "my-root") diff --git a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl b/gnu/system= /examples/raspberry-pi-64-nfs-root.tmpl index 1baca02491..85476854f3 100644 --- a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl +++ b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl @@ -25,14 +25,21 @@ (operating-system (host-name "raspberrypi-guix") (timezone "Europe/Berlin") - (bootloader (bootloader-configuration - (bootloader grub-efi-bootloader-chain-raspi-64) - (targets (list "/boot/efi")) - (theme (grub-theme - (resolution '(1920 . 1080)) - (image (file-append - %artwork-repository - "/grub/GuixSD-fully-black-16-9.svg")))))) + (bootloader (list (bootloader-configuration + (bootloader u-boot-rpi-bootloader) + (targets (list (bootloader-target + (type 'install) + (path "/boot/efi"))))) + (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))) + (theme + (grub-theme + (resolution '(1920 . 1080)) + (image (file-append %artwork-repository + "/grub/GuixSD-fully-black-16-9.svg"))= ))))) (kernel-arguments '("ip=3Ddhcp")) (kernel (customize-linux #:linux linux-libre-arm64-generic #:extra-version "arm64-generic-netboot" diff --git a/gnu/system/examples/raspberry-pi-64.tmpl b/gnu/system/examples= /raspberry-pi-64.tmpl index 414d8ac7a5..d5b90b9705 100644 --- a/gnu/system/examples/raspberry-pi-64.tmpl +++ b/gnu/system/examples/raspberry-pi-64.tmpl @@ -24,14 +24,16 @@ (operating-system (host-name "raspberrypi-guix") (timezone "Europe/Berlin") - (bootloader (bootloader-configuration - (bootloader grub-efi-bootloader-chain-raspi-64) - (targets (list "/boot/efi")) - (theme (grub-theme - (resolution '(1920 . 1080)) - (image (file-append - %artwork-repository - "/grub/GuixSD-fully-black-16-9.svg")))))) + (bootloader (list (bootloader-configuration + (bootloader u-boot-rpi-bootloader) + (targets (list (bootloader-target + (type 'install) + (path "/boot/efi")))) + (theme + (grub-theme + (resolution '(1920 . 1080)) + (image (file-append %artwork-repository + "/grub/GuixSD-fully-black-16-9.svg"))= ))))) (kernel (customize-linux #:linux linux-libre-arm64-generic ;; It is possible to use a specific defconfig ;; file, for example the "bcmrpi3_defconfig" = with diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-ima= ge.tmpl index 589de493b1..050c0bb971 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -38,11 +38,10 @@ accounts.\x1b[0m =20 (firmware '()) =20 - ;; Below we assume /dev/vda is the VM's hard disk. - ;; Adjust as needed. + ;; Images automatically get the 'root, 'esp, and 'disk targets configure= d as + ;; needed. (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vda")) (terminal-outputs '(console)))) (file-systems (cons (file-system (mount-point "/") --=20 2.45.2