[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/47: gnu: gnumach: Support "noide" argument.
From: |
guix-commits |
Subject: |
21/47: gnu: gnumach: Support "noide" argument. |
Date: |
Sat, 3 Jun 2023 07:23:38 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 27374c115283fe239dbf8549a7acaa02e718466d
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri May 19 14:03:47 2023 +0200
gnu: gnumach: Support "noide" argument.
* 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 | 24 ++++++++++++++++++++++-
gnu/local.mk | 1 +
gnu/packages/hurd.scm | 3 ++-
gnu/packages/patches/gnumach-support-noide.patch | 25 ++++++++++++++++++++++++
4 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7f8d8d66e9..a0aa5425b6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -39835,7 +39835,29 @@ For example:
@item @code{multiboot-arguments} (default: @code{'()})
The list of extra command-line arguments for the multiboot-kernel.
-@item @code{multiboot-modules} (default: @code{'()})
+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 and still experimental
+@uref{https://darnassus.sceen.net/~hurd-web/rump_kernel/, rumpdisk
+user-level disk driver} instead of GNU@tie{}Mach's in-kernel IDE driver,
+set @code{kernel-arguments} to:
+
+@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:
@lisp
diff --git a/gnu/local.mk b/gnu/local.mk
index 00442eec56..3a7ae2e0c3 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 c1b0af9a35..4fe68740fb 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -80,7 +80,8 @@ GNU/Hurd."
(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 ();
- branch wip-hurd created (now d764d59efe), guix-commits, 2023/06/03
- 03/47: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/03
- 06/47: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/03
- 11/47: gnu: Add libpciaccess-0.17., guix-commits, 2023/06/03
- 16/47: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/03
- 21/47: gnu: gnumach: Support "noide" argument.,
guix-commits <=
- 05/47: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/03
- 10/47: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/03
- 13/47: gnu: Add rumpkernel., guix-commits, 2023/06/03
- 25/47: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/06/03
- 23/47: hurd-boot: Cater for netdde., guix-commits, 2023/06/03
- 30/47: gnu: commencement: mig-boot0: Update to 1.8+git20230520., guix-commits, 2023/06/03
- 02/47: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/06/03
- 15/47: gnu: parted: Support building for the Hurd., guix-commits, 2023/06/03
- 17/47: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/03
- 27/47: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/06/03