From patchwork Tue Oct 22 14:34:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 32327 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 8C70127BBEA; Tue, 22 Oct 2024 15:34:58 +0100 (BST) 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,URIBL_BLOCKED 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 517F927BBE2 for ; Tue, 22 Oct 2024 15:34:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3Fy1-0006t5-9j; Tue, 22 Oct 2024 10:34:37 -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 1t3Fxy-0006sl-OF for guix-patches@gnu.org; Tue, 22 Oct 2024 10:34:35 -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 1t3Fxy-0007j0-Dt for guix-patches@gnu.org; Tue, 22 Oct 2024 10:34:34 -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:Date:References:In-Reply-To:From:To:Subject; bh=Nz2URt+C0WWVoxsTlpoOk6nlgUk7eQ5V0m/IBdDF5Fg=; b=VpFiihre/2IduDyZDsK2sce0SvywIufHbk+oOu05OiM4cJ71dDLIMSsm90bZ2x/GwEAWtqfPxVl6FO8z6WRTMzh+aWI4msSc9G8sOn4deoqLkCax1kXEPzRRB2ifWfZKF20pjCTQjnWPXuGD742etXN05BNG7CgOEEws9pAWKEnB2v2N2BdJimlIJEL8Kwdxi+TwysRVqPzv0XlAXSqF/80XsOl/YyB+AABY8K3GOWF9vAJ/2EluloH4LeiOr6jTdn2Muf5y1Y5fP9UnNx14h180gvU+fLDR8fSK4EzhadrxIeuFn9uiHykppuE9sosgWRm881H2F4AKiYyKw+mYnw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3FyQ-0006aq-1B for guix-patches@gnu.org; Tue, 22 Oct 2024 10:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH 14/16] installer: Add "Kernel" page to select the Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Oct 2024 14:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 73927@debbugs.gnu.org, Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 73927-submit@debbugs.gnu.org id=B73927.172960769025318 (code B ref 73927); Tue, 22 Oct 2024 14:35:01 +0000 Received: (at 73927) by debbugs.gnu.org; 22 Oct 2024 14:34:50 +0000 Received: from localhost ([127.0.0.1]:56855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FyE-0006aI-4L for submit@debbugs.gnu.org; Tue, 22 Oct 2024 10:34:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3Fy9-0006a0-UH for 73927@debbugs.gnu.org; Tue, 22 Oct 2024 10:34:47 -0400 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 1t3Fxb-0007h5-6N; Tue, 22 Oct 2024 10:34:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Nz2URt+C0WWVoxsTlpoOk6nlgUk7eQ5V0m/IBdDF5Fg=; b=A1KBtPOuIPw4sq5Ig3dY 1ckOq55l59z4156Ojg2sivFmKnPj1IPQSidHZ02hXfChAKERycxbhlWQAvHHL1HdKD7xFnJL5JSvL DfrahCsBtE4oPv2VNYy4ivd+kSehfixI9i9dk+ubv+5yI8B172EnAZVP6noSQ6sipvnP/YeqILlfO iSwd+7RgmxHt4SFzugKwhaC7HpDoLChimevZfWi+Fn296ChnA2MdGDzXkaetIS9RJKlwDpUvjFmVR f+u3wSORFlCzCqoHnrQresvjoz4nCTBYHwE8jFbvF8dEIYZFmfzOAcWD/gIrWpbCVK9TuZfEJ9fFW nfMLCMz45JrrUw==; From: In-Reply-To: <87v7xkcyda.fsf@gnu.org> (janneke@gnu.org's message of "Tue, 22 Oct 2024 10:53:21 +0200") Organization: AvatarAcademy.nl References: <87ttd5cohr.fsf@gnu.org> <87v7xkcyda.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Tue, 22 Oct 2024 16:34:06 +0200 Message-ID: <87ldygcild.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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 Hi, >> The installer patches look OK to me, I will try to test them >> on real hardware soon. Just a heads-up: While I'm pretty sure that the the config.scm is OK (if you don't select any options, use static networking and fill in your IP and gateway), I haven't had any luck yet installing it. The guile-fibers for the hurd does currently (?) not cross-build from 32 bit, i.e. guix build guile-fibers --target=i586-pc-gnu --system=i686-linux fails, and I had no luck with a 64bit machine, getting i/o errors while running guix init. No idea which device fails on me there. > Ah, right; that fails. I'll look into it, thanks for the pointer. > Where are the .ppm files saved/how do I get at them? Hmm, I could use some help here. I tried the almost trivial patch attached, but that fails and it's not clear to my why. Possibly I don't understand the code because it seems to me that the screenshot names go out of sync after the locale page. Also, the roundtrip time to test something out is pretty bad... Greetings, Janneke From 22d12407d3b291318b76ac167d22104cc2852a85 Mon Sep 17 00:00:00 2001 Message-ID: <22d12407d3b291318b76ac167d22104cc2852a85.1729607385.git.janneke@gnu.org> From: Janneke Nieuwenhuizen Date: Tue, 22 Oct 2024 11:00:59 +0200 Subject: [PATCH] squash! installer: Add "Kernel" page to select the Hurd. * gnu/installer/tests.scm (choose-kernel): New procedure. * gnu/tests/install.scm (gui-test-program): Use it. --- gnu/installer/tests.scm | 11 +++++++++++ gnu/tests/install.scm | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm index 8785cd9a9f..a9a5d5d988 100644 --- a/gnu/installer/tests.scm +++ b/gnu/installer/tests.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ (define-module (gnu installer tests) choose-locale+keyboard enter-host-name+passwords + choose-kernel choose-services choose-partitioning start-installation @@ -211,6 +213,15 @@ (define* (enter-host-name+passwords port (password ,password))) names passwords)))))) +(define* (choose-kernel port #:key (kernel "Linux Libre")) + "Converse over PORT with the guided installer to choose the specified +KERNEL." + (converse port + ((list-selection (title "Kernel") + (multiple-choices? #f) + (items _)) + kernel))) + (define* (choose-services port #:key (choose-desktop-environment? (const #f)) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 36dbd9111f..6be582373d 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -1869,6 +1869,9 @@ (define* (gui-test-program marionette #$marionette) (screenshot "installer-services.ppm") + (marionette-eval* '(choose-kernel installer-socket) #$marionette) + (screenshot "installer-kernel.ppm") + (marionette-eval* '(choose-services installer-socket #:choose-desktop-environment? (const #$desktop?) base-commit: 80f8ef0a01f2cf39deebfecc344e5f04d87d4bd4 -- 2.46.0