From patchwork Tue May 23 15:47:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50259 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 91F4227BBF1; Tue, 23 May 2023 16:49:09 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 9762027BBED for ; Tue, 23 May 2023 16:49:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1UFH-0007TY-Qe; Tue, 23 May 2023 11:48:19 -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 1q1UF9-0007BH-8M for guix-patches@gnu.org; Tue, 23 May 2023 11:48:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1UF8-0006Hh-3Q for guix-patches@gnu.org; Tue, 23 May 2023 11:48:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1UF7-0007uR-UV for guix-patches@gnu.org; Tue, 23 May 2023 11:48:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 11/11] gnu: gnumach: Support "noide" argument. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168485688930392 (code B ref 63527); Tue, 23 May 2023 15:48:09 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:09 +0000 Received: from localhost ([127.0.0.1]:40251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF6-0007tu-9X for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEn-0007p3-Kx for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:50 -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 1q1UEi-00065c-DR; Tue, 23 May 2023 11:47:44 -0400 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=Urexv9O+m9VByYE3Imu6zU9q9x2aGsV7uDxf9Wn/kvM=; b=SKCCsd6BkpUcjgmU4jQO ehF40gLrHDdJFx7Xh4yqRTLfUUoGAQYl5cA80T0BFOz4sN/6/LBNLnEQIojDTtrLAucxQwSnrayDy HUnEySBpVm7vPyTm3lvMm6kumE4A7rsNrKQeX0OGz/RHa6BkXhPWzHiVWaouPBLDeyPYQXKnb7gLE 7kz7LjeBxDYyivh8cRZgE7aNiSEvly3sx2kXTFJZvZ1lPs3ZpCaLCrZgxLBO+pUNOpRdNz1gzB4xG Df0S3+Ay2cspShLSkQ1XyvFBeRcdi69DtIlReWQsRdURoH3harQ82UQIt+Ak6Mhxynbdb+KfGrbAI LOA3FEnvCshSUQ==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1q1UEi-0002jp-0y; Tue, 23 May 2023 11:47:44 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:32 +0200 Message-Id: <82af884b2c75d17e8548854300458e49fda8a755.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/patches/gnumach-support-noide.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/hurd.scm (gnumach-headers): Use it. * doc/guix.texi (Bootloader Configuration): Document it. --- doc/guix.texi | 21 ++++++++++++++++ gnu/local.mk | 1 + gnu/packages/hurd.scm | 3 ++- .../patches/gnumach-support-noide.patch | 25 +++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnumach-support-noide.patch diff --git a/doc/guix.texi b/doc/guix.texi index f4cca66d76..11ce9340ae 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39779,6 +39779,27 @@ Bootloader Configuration @item @code{multiboot-arguments} (default: @code{()}) The list of extra command-line arguments for the multiboot-kernel. +For example, when running in QEMU it can be useful to use a text-based +console (use options @option{--nographic} @option{--serial mon:stdio}): + +@lisp +'("console=com0"") +@end lisp + +To use the new (experimental) rumpdisk (See +@url{https://darnassus.sceen.net/~hurd-web/rump_kernel/, GNU Hurd rump +kernel}) instead of the legacy gnumach buitin IDE support: + +@lisp +'("noide") +@end lisp + +Of course, these options can be combined: + +@lisp +'("console=com0" "noide") +@end lisp + @item @code{multiboot-modules} (default: @code{()}) The list of commands for loading Multiboot modules. For example: diff --git a/gnu/local.mk b/gnu/local.mk index 052b76ea7e..e633afa4b4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1277,6 +1277,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch \ + %D%/packages/patches/gnumach-support-noide.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 536df96e00..c44c51818e 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -80,7 +80,8 @@ (define-public gnumach-headers (file-name (git-file-name "gnumach" version)) (sha256 (base32 - "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs")))) + "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs")) + (patches (list (search-patch "gnumach-support-noide.patch"))))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/gnumach-support-noide.patch b/gnu/packages/patches/gnumach-support-noide.patch new file mode 100644 index 0000000000..723d4bcac4 --- /dev/null +++ b/gnu/packages/patches/gnumach-support-noide.patch @@ -0,0 +1,25 @@ +Upstream status: Taken from Debian/upsream. + + https://salsa.debian.org/hurd-team/gnumach/-/blob/master/debian/patches/90_noide.patch + +This supports using `noide' on the gnumach command line, disabling +gnumach IDE support and thus forcing use of rumdisk. + +--- + linux/dev/glue/block.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/linux/dev/glue/block.c ++++ b/linux/dev/glue/block.c +@@ -207,7 +207,10 @@ int + blk_dev_init () + { + #ifdef CONFIG_BLK_DEV_IDE +- ide_init (); ++ extern char *kernel_cmdline; ++ if (strncmp(kernel_cmdline, "noide", 5) && ++ !strstr(kernel_cmdline, " noide")) ++ ide_init (); + #endif + #ifdef CONFIG_BLK_DEV_FD + floppy_init ();