From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 19:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63527@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168417934115964 (code B ref -1); Mon, 15 May 2023 19:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2023 19:35:41 +0000 Received: from localhost ([127.0.0.1]:44467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pydyu-00049Q-Us for submit@debbugs.gnu.org; Mon, 15 May 2023 15:35:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:40732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pydys-00049G-9c for submit@debbugs.gnu.org; Mon, 15 May 2023 15:35:40 -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 1pydyr-0008H9-RC for guix-patches@gnu.org; Mon, 15 May 2023 15:35:37 -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 1pydyr-00087V-4F; Mon, 15 May 2023 15:35:37 -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:Subject:To:From:in-reply-to: references; bh=ZSC+njlzsJzVusOEFMp8IElczBrSudSZ8ei/0hxpv1A=; b=JAUqEve87iR0ls FntOuCt7CUa/EHbt86Y+OSxDR+NkxiYW1nJz9QB7OOjEiZLzpr0IiQfa7iTbDRcoV4lpK45trSSaW 0+cdMHe+nLyqYOzxrpBQ+Wn9HsKbSkSCV2kNgWBHQnoF2jhWq4PtU/Gjn7UKOKGCv0lA6vqll5CO/ rxCk8Rv7MLGe4bsf9u+pjKZ2cSRusf2yweljOJra6oeO93VoSs6p2XFKtj7mDutXHiEcBdpOLT7ez 6cj17ckpGDr9tdiVDzzoQ6oJredfJjfqU3PSsJ0uk4G+AAHb/B5sEn4KBFZ5pJMBVX0rLWGjQ9ZGr mLlyrQnnj/1JKU/tvb1Q==; 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 1pydyp-0002Bh-9Y; Mon, 15 May 2023 15:35:36 -0400 From: Janneke Nieuwenhuizen Date: Mon, 15 May 2023 21:35:31 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Some time ago we kind of promised to move forward with the Hurd[0] and while we have had this pretty neat "childhurd" feature for some time[1], to really do that we should get it to boot on real iron. An important ingredient to make that happen made it into Hurd upstream over a year ago[2]: rumpdisk support making use of the NetBSD rumpkernel[3]. Building this rumpkernel is a bit tricksy, Debian uses an import of the NetBSD git archive[4] --which is quite large--with some twenty-odd custom patches[5]. Some of us asked bug-hurd to document their rumpkernel support[6] or distribute it in a less Debian-centric and more usual way to make it more digestible for other parties (such as Guix) to adopt, but that was rejected at the time[7]. Inspired by Josselin Poiret's recent Hurd updates[8] our chats on IRC and especially their succes in getting it to boot again on master[9], I decided to just take the easiest route possible and build the rumpkernel from Debian's salsa package git archive and its patch series. The good news is that with this patch series the Hurd now has two additional servers: pci.arbiter and rumpdisk. Sadly, it currently hangs for me on --8<---------------cut here---------------start------------->8--- start: pci.arbiter: --8<---------------cut here---------------end--------------->8--- Anyway, while this builds, we probably do not want to rely on Debian's packaging support in this way but I'm also not sure what would be a better course of action right now. Other than asking bug-hurd again to create an upstream for their code outside/independent of their packaging. Help and thoughts much appreciated! See also: https://gitlab.com/janneke/guix/-/tree/wip-hurd Greetings, Janneke PS: I build it like this --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix system image -t hurd-qcow2 gnu/system/examples/bare-hurd.tmpl --8<---------------cut here---------------end--------------->8--- and start it doing --8<---------------cut here---------------start------------->8--- guix shell qemu -- qemu-system-i386 \ -m 1024 \ --enable-kvm \ --device rtl8139,netdev=net0 \ --netdev user,id=net0,hostfwd=tcp:0.0.0.0:11022-:2222 \ --snapshot \ --hda /gnu/store/0zmdmjafmz0hgzw3gszl38nd0n2bblq9-disk-image --8<---------------cut here---------------end--------------->8--- [0] https://guix.gnu.org/en/blog/2020/deprecating-support-for-the-linux-kernel/ [1] https://guix.gnu.org/en/blog/2020/childhurds-and-substitutes/ [2] https://archive.fosdem.org/2022/schedule/event/dzammit/ [3] https://wiki.netbsd.org/rumpkernel [4] https://salsa.debian.org/hurd-team/rumpkernel [5] https://salsa.debian.org/hurd-team/rumpkernel/-/tree/master/debian/patches [6] https://lists.gnu.org/archive/html/bug-hurd/2022-02/msg00020.html [7] https://lists.gnu.org/archive/html/bug-hurd/2022-02/msg00051.html [8] https://mail.gnu.org/archive/html/guix-patches/2023-03/msg01597.html [9] https://issues.guix.gnu.org/63501 Janneke Nieuwenhuizen (3): DRAFT gnu: Add rumpkernel. gnu: hurd: Add rumpkernel. DRAFT system: hurd: Boot with pci.arbiter and rumpdisk. gnu/packages/hurd.scm | 232 +++++++++++++++++++++++++++++++++++++++++- gnu/system.scm | 26 ++++- 2 files changed, 248 insertions(+), 10 deletions(-) base-commit: 555a41f31c9ec9f4344d00beb94f663b44017019 -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 1/3] DRAFT gnu: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 19:38:02 +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.168417943116153 (code B ref 63527); Mon, 15 May 2023 19:38:02 +0000 Received: (at 63527) by debbugs.gnu.org; 15 May 2023 19:37:11 +0000 Received: from localhost ([127.0.0.1]:44477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pye0M-0004CS-I9 for submit@debbugs.gnu.org; Mon, 15 May 2023 15:37:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pye0K-0004C7-E5 for 63527@debbugs.gnu.org; Mon, 15 May 2023 15:37:09 -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 1pye0F-0008VA-53; Mon, 15 May 2023 15:37:03 -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=ouhDeB3JbtDrsWFNUIEGt3CZLBpLC+p9B7GWsiUlypA=; b=e4fulqqoyPEe98vystFu q+jJXFdZ14b9LtcnV7NbCgbwdc5PKD34CJIROo8cCAKG8dBXYSZA+eAtZe167ud89HZzZyPL2C4E0 aAGKE5ebKS5GVkH3/pTByJgBcLyU4pcd7Hsy8572zJvwdhE/lj2qXhl/j3XKRFutVateo5xpZH6sK 3g+nXdNk0QLiu82ywkbdwM6senZltZLJbZzvjDYoSXpSWEQIRZTbhYtCrOuFjzov7wX8IoIN58kLl jomr/nir4M7NYRACbnyUHNRDzxDa4b5dM68bdArKuRwsGO4cXwPDZJTCeI7wSh/zhaxMUK9IfwgWR tq2vf4v6DDDUnQ==; 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 1pye0D-0002J4-4l; Mon, 15 May 2023 15:37:02 -0400 From: Janneke Nieuwenhuizen Date: Mon, 15 May 2023 21:36:57 +0200 Message-Id: <3c1235a19285d40174f0aadb1ac5fdead22f2961.1684177770.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) XXX We should probably not use Debian Salsa as source for the rumpkernel checkout and patches and use the rumpkernel upstream instead copying Debian's patches into our archive? Using the easier route as a first attempt to git it to build (and boot) first. * gnu/packages/hurd.scm (rumpkernel): New variable. --- gnu/packages/hurd.scm | 216 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 215 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 34c7c00f2d..f834abcf43 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018, 2020-2023 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Rene Saavedra ;;; @@ -662,3 +662,217 @@ (define-public netdde ;; Some drivers are dually licensed with the options being GPLv2 or one ;; of MPL/Expat/BSD-3 (dependent on the driver). (license gpl2)))) + +(define-public rumpkernel + (let ((commit "cd34aee0ee0f7a06011b2f988ce27a8fdc7ba900") + (revision "0")) + (package + (name "rumpkernel") + (version (git-version "0-20211031" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/hurd-team/rumpkernel.git") + (commit commit))) + (sha256 + (base32 + "0dqr6nzsv25p66yiambq4jcq4870vzf23289cns0gdpk74gamm4l")) + (file-name (git-file-name name commit)))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:modules '((srfi srfi-26) + (ice-9 match) + (ice-9 rdelim) + (guix build utils) + (guix build gnu-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patches + (lambda* (#:key target #:allow-other-keys) + (let* ((patch-directory "debian/patches/") + (series (string-append patch-directory "series")) + (text (with-input-from-file series read-string)) + (lines (string-split (string-trim-right text) #\newline)) + (patches (filter (negate (cute string-prefix? "#" <>)) + lines)) + (patch-files (map (cute string-append patch-directory <>) + patches))) + (for-each + (cute invoke "patch" "--force" "-p1" "-i" <>) + patch-files) + (when target + (substitute* "pci-userspace/src-gnu/Makefile.inc" + (("\\") + (string-append target "-mig"))) + (substitute* "buildrump.sh/src/build.sh" + (("if [[] \"$[{]tool[}]\" = \"CC\" []]; then" all) + (string-append + "if [ \"${tool}\" = \"AR\" ]; then + lctool=${TARGET_AR-ar} + elif [ \"${tool}\" = \"NM\" ]; then + lctool=${TARGET_NM-nm} +el" + all)))) + ;; Avoid #! /gnu/store/...-bash/gnu/store/...-bash/bin/sh + (substitute* '("buildrump.sh/src/tools/genassym/Makefile" + "buildrump.sh/src/tools/lorder/Makefile") + (("[$][{]TOOL_SED[}] -e \"s,/bin/sh") + "${TOOL_SED} -e \"s,[ !]/bin/sh"))))) + (add-before 'configure 'setenv + (lambda* (#:key build target #:allow-other-keys) + (define (noisy-setenv name value) + (setenv name value) + (format (current-error-port) "set ~a=~s\n" name value)) + (noisy-setenv "HOST_CC" "gcc") + (let ((target (or target build))) + (noisy-setenv "TARGET_AR" (string-append target "-ar")) + (noisy-setenv "TARGET_CC" (string-append target "-gcc")) + (noisy-setenv "TARGET_CXX" (string-append target "-g++")) + (noisy-setenv "TARGET_LD" (string-append target "-ld")) + (noisy-setenv "TARGET_NM" (string-append target "-nm"))) + (setenv "PAWD" "pwd") + (for-each + (cute noisy-setenv <> "") + '("_GCC_CRTENDS" + "_GCC_CRTEND" + "_GCC_CRTBEGINS" + "_GCC_CRTBEGIN" + "_GCC_CRTI" + "_GCC_CRTN")) + (noisy-setenv "BSDOBJDIR=" (string-append (getcwd) "/obj")))) + (replace 'configure + (lambda args + (let ((configure (assoc-ref %standard-phases 'configure))) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (apply configure args))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (let* ((jobs (if parallel-build? (parallel-job-count) 1)) + (host-cpu (match #$(or (%current-target-system + (%current-system))) + ("i586-pc-gnu" "i386") + ("i686-linux" "i386") + ("x86_64-linux" "amd64"))) + (toprump (string-append + (getcwd) + "/buildrump.sh/src/sys/rump")) + (rump-make (string-append + (getcwd) + "/buildrump.sh/src/obj/tooldir/bin/nbmake-" + host-cpu))) + (mkdir "obj") + (with-directory-excursion "buildrump.sh/src" + (invoke + "sh" "build.sh" + "-V" "TOOLS_BUILDRUMP=yes" + "-V" "MKBINUTILS=no" + "-V" "MKGDB=no" + "-V" "MKGROFF=no" + "-V" (string-append "TOPRUMP=" toprump) + "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" + "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" + "-V" (string-append + "CPPFLAGS=" + " -I../../obj/destdir." host-cpu "/usr/include" + " -D_FILE_OFFSET_BITS=64" + " -DRUMP_REGISTER_T=int" + " -DRUMPUSER_CONFIG=yes" + " -DNO_PCI_MSI_MSIX=yes" + " -DNUSB_DMA=1") + "-V" (string-append + "CWARNFLAGS=" + " -Wno-error=maybe-uninitialized" + " -Wno-error=address-of-packed-member" + " -Wno-error=unused-variable" + " -Wno-error=stack-protector" + " -Wno-error=array-parameter" + " -Wno-error=array-bounds" + " -Wno-error=stringop-overflow") + "-V" "LIBCRTBEGIN=" + "-V" "LIBCRTEND=" + "-V" "LIBCRT0=" + "-V" "LIBCRTI=" + "-V" "_GCC_CRTENDS=" + "-V" "_GCC_CRTEND=" + "-V" "_GCC_CRTBEGINS=" + "-V" "_GCC_CRTBEGIN=" + "-V" "_GCC_CRTI=" + "-V" "_GCC_CRTN=" + "-U" + "-u" + "-T" "./obj/tooldir" + "-m" host-cpu + "-j" (number->string jobs) + "tools" + "rump")) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (setenv "RUMPRUN" "true") + (invoke rump-make "dependall")) + (with-directory-excursion "pci-userspace/src-gnu" + (invoke rump-make "dependall"))))) + (replace 'install + (lambda _ + (define (install-file file target) + (let ((dest (string-append target (basename file)))) + (format (current-output-port) "`~a' -> `~a'~%" file dest) + (mkdir-p (dirname dest)) + (if (file-exists? dest) + (format (current-error-port) + "warning: skipping: ~a\n" file) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest))))))) + (let ((header (string-append #$output "/include/rump")) + (lib (string-append #$output "/lib/"))) + (mkdir-p header) + (copy-recursively "buildrump.sh/src/sys/rump/include/rump" + header) + (mkdir-p lib) + (for-each + (cute install-file <> lib) + (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") + (find-files "obj" "librump.*[.](a|so.*)"))))))))) + (inputs + (list gnumach-headers libpciaccess)) + (native-inputs + (list + autoconf + automake + libgcrypt + (if (%current-target-system) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig) + zlib)) + (supported-systems %hurd-systems) + (home-page "https://wiki.netbsd.org/rumpkernel") + (synopsis "NetBSD as rumpkernel for the GNU/Hurd") + (description + "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that +the Hurd may be installed on iron. Using this rumpkernel package, the hurd +package's rumpdisk can be built which provides the pci.arbiter and rumpdisk +servers.") + (license (list + asl2.0 + boost1.0 + bsd-2 + bsd-3 + bsd-4 + cddl1.0 + expat + gpl1 + gpl2+ + gpl3+ + isc + lgpl2.0+ + public-domain + (@ (guix licenses) zlib) + (non-copyleft "file://src/lib/libc/hash/hashhl.c" + "See debian/copyright in the distribution.")))))) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 2/3] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 19:38:02 +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.168417943316162 (code B ref 63527); Mon, 15 May 2023 19:38:02 +0000 Received: (at 63527) by debbugs.gnu.org; 15 May 2023 19:37:13 +0000 Received: from localhost ([127.0.0.1]:44479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pye0P-0004Cc-FN for submit@debbugs.gnu.org; Mon, 15 May 2023 15:37:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pye0L-0004C9-0i for 63527@debbugs.gnu.org; Mon, 15 May 2023 15:37:10 -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 1pye0F-0008VO-Qt; Mon, 15 May 2023 15:37:03 -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=NGPGkoq+SMinUGziETMNFjF+4BHxMRu9wnBMSzvgRCg=; b=K4k/4tzCE5bDQEv+uWPD njLraJrE0q6eZTtEqIdF7bM1El63W6RMJNkSOuZIb0mjHM4fLTt2KsrtxlMMKjIiP2Rpk1fuv+3Sg 3RQE579TvyPPoRw7bjIcn6v+sreUIIisNuwX6tzl75KuU0mTql9wtMjqSlo0/tmgz7Gz4U1JqpWsJ hcHxGrXi4k/LEQWQCFAVR2LNEyIqbHXG3UaEkfTfEjOAvv5gjEBXEgOS5h0FzyJniEJf7p++183qs EeBb4mRUVqn4tpFgpbUBBgVCQgMFITBOyYt6UBa/MVhrEzbtulrI0Ke1kEGqGKKXdTmwk86nfylKx Vn74IHRb2f9WaQ==; 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 1pye0F-0002J4-BK; Mon, 15 May 2023 15:37:03 -0400 From: Janneke Nieuwenhuizen Date: Mon, 15 May 2023 21:36:58 +0200 Message-Id: <48105ac954b73df35d9c0d1ff7ec398e26634d4b.1684177770.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd)[inputs]: Add rumpkernel. [arguments]: Rename `prepare-dde' phase to 'prepare-addons'. Add "rumpdisk" directory. --- gnu/packages/hurd.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index f834abcf43..fad529580d 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -356,7 +356,7 @@ (define-public hurd (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-dde + (add-after 'unpack 'prepare-addons (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) @@ -370,7 +370,10 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit")))) + "libbpf libmachdevdde libddekit rumpdisk")) + (substitute* "rumpdisk/Makefile" + (("rumpdev_ahcisata" all) + (string-append all " rumpdev_ata"))))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -541,7 +544,11 @@ (define-public hurd ;; clnt_create "ac_func_search_save_LIBS=-ltirpc" "ac_cv_search_clnt_create=false" - "CFLAGS=-fcommon"))) + "CFLAGS=-fcommon") + #:make-flags + (list (string-append "RUMPPATH=" + (assoc-ref %build-inputs "rumpkernel") + "/lib")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) ;for /hurd/random @@ -557,7 +564,8 @@ (define-public hurd ("coreutils" ,coreutils) ("sed" ,sed) ("grep" ,grep) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux) + ("rumpkernel" ,rumpkernel))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 3/3] DRAFT system: hurd: Boot with pci.arbiter and rumpdisk. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 19:38:03 +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.168417943616179 (code B ref 63527); Mon, 15 May 2023 19:38:03 +0000 Received: (at 63527) by debbugs.gnu.org; 15 May 2023 19:37:16 +0000 Received: from localhost ([127.0.0.1]:44481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pye0R-0004Cs-TA for submit@debbugs.gnu.org; Mon, 15 May 2023 15:37:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pye0L-0004CA-Ks for 63527@debbugs.gnu.org; Mon, 15 May 2023 15:37:14 -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 1pye0G-0008Vf-EJ; Mon, 15 May 2023 15:37:04 -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=EdqPladPbxP0GaDfni40Jcxv3IZfDWlTVmsA30JiTCI=; b=MlUNv6YtS7GmVAwEwJOu 86jYrZFuQP0hlw+8pvgWIVEDSCIZuzYSkKBOfYA3DVHKLSlS5Z5TY5lEAX2xDjYZl+oeyJVwgNvUg WCRUuELZSC7XEeBxAO4BA2H8a3TQS79aI8NFdG0kWc/DvdRe/PDdzxPW6sUnDUWMkP3JRa/bkwxX/ GdYsd9XYNKXDVsHrNQBdaCwHxfpAYFmQX/sdqSHDdcAyMJfnmyeaOHsXuRHaIfWxRhdyetISy0L1N hCwp3nLz4dL2fnQSt68wB/ufT8bO1rc0u3Qoy6spC/g9a/cSzWNwQk4KBC3qIBFREF8CxHuLsrm67 74KZ7h+hp96CCw==; 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 1pye0G-0002J4-0w; Mon, 15 May 2023 15:37:04 -0400 From: Janneke Nieuwenhuizen Date: Mon, 15 May 2023 21:36:59 +0200 Message-Id: <92582077be8b8e0d7ff87458f78cddd2afc6de65.1684177770.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) XXX Debian uses the .STATIC variants, but they are not being built. Do we need those? * gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and rumpdisk. --- gnu/system.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..29445cec2d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2022 Maxim Cournoyer -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework @@ -1486,16 +1486,29 @@ (define (operating-system-multiboot-modules os) (define (hurd-multiboot-modules os) (let* ((hurd (operating-system-hurd os)) + (pci-arbiter-command + (list (file-append hurd "/hurd/pci-arbiter") + "pci.arbiter" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--next-task='${disk-task}'" + "--store-type=typed" + "'$(pci-task=task-create)'" + "'$(task-resume)'")) + (rumpdisk-command + (list (file-append hurd "/hurd/rumpdisk") + "rumpdisk" + "--next-task='${fs-task}'" + "'$(disk-task=task-create)'")) (root-file-system-command (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" "--multiboot-command-line='${kernel-command-line}'" - "--host-priv-port='${host-port}'" - "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" "--x-xattr-translator-records" - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + "'${root}'" + "'$(fs-task=task-create)'")) (target (%current-target-system)) (libc (if target (with-parameters ((%current-target-system #f)) @@ -1512,7 +1525,10 @@ (define (hurd-multiboot-modules os) ;; (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'") (list (file-append hurd "/hurd/exec.static") "exec" "'$(exec-task=task-create)'"))) - (list root-file-system-command exec-server-command))) + (list pci-arbiter-command + rumpdisk-command + root-file-system-command + exec-server-command))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v2 0/3] Initial attempt at rumpdisk support for the Hurd. References: In-Reply-To: Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 13:49:02 +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.168424493929393 (code B ref 63527); Tue, 16 May 2023 13:49:02 +0000 Received: (at 63527) by debbugs.gnu.org; 16 May 2023 13:48:59 +0000 Received: from localhost ([127.0.0.1]:45768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2w-0007dx-Fs for submit@debbugs.gnu.org; Tue, 16 May 2023 09:48:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2u-0007dR-9I for 63527@debbugs.gnu.org; Tue, 16 May 2023 09:48:57 -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 1pyv2o-0004Ht-3z; Tue, 16 May 2023 09:48:50 -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:Subject:To:From:in-reply-to: references; bh=FqyklxgnBAPkTtuSDjsmgKXb2xFnb54dldH38UAR/fY=; b=blPR8BCd5dG/Vu 6pMzoy5zMB+VVtiJ+lDrOTjeWy3bcRxGI5FPeLF7EhjKN/+iawI9+p2jGbufeL7vHnDyTu42i6g+M l0sbcA927oNr5sx/bcQog/XMHwwRxRTdh/vu4k4JJ/8AA8Uum0cvognTXqvWtIq20rrXVOcuQsPfq 145wgWXqklAcW9l0nD0dvplYeE04P2yYIxl5/0YHWS1ljeaNxofdDPWvmWaaHIA1nG5XT3PAMUtYd 1PArc7z2qyvS5kOSde9MIXT3+zR+6eCfSQOMy9pg8mJ9nZ368NuDvLEN5m02gXUT42tkoPPVwNYRZ ykninIiZrg1pdH6Nm8rw==; 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 1pyv2n-00086i-N8; Tue, 16 May 2023 09:48:49 -0400 From: Janneke Nieuwenhuizen Date: Tue, 16 May 2023 15:48:43 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Our patches for the rumpkernel crossbuild have been accepted upstream https://lists.gnu.org/archive/html/bug-hurd/2023-05//msg00276.html which makes our rumpkernel package a lot nicer. I suggest using the Debian Salsa rumpkernel package as upstream for now until development has stabilized. The pci.arbiter and rumpdisk are now also built statically and the .STATIC variants are used for grub.cfg. A copy/pasto was fixed for the grub.cfg. Sadly, we only get just a little bit further, boot now hangs like this for me: start pci.arbiter: pci pci.arbiter: Starting the PCI system: Gratuitous error Greetings, Janneke Janneke Nieuwenhuizen (3): gnu: Add rumpkernel. gnu: hurd: Add rumpkernel. DRAFT system: hurd: Boot with pci.arbiter and rumpdisk. gnu/local.mk | 1 + gnu/packages/hurd.scm | 225 +++++++++++++++++- .../patches/rumpkernel-cross-build.patch | 153 ++++++++++++ gnu/system.scm | 25 +- 4 files changed, 394 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/rumpkernel-cross-build.patch base-commit: 555a41f31c9ec9f4344d00beb94f663b44017019 -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v2 1/3] gnu: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 13:49:02 +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.168424494029402 (code B ref 63527); Tue, 16 May 2023 13:49:02 +0000 Received: (at 63527) by debbugs.gnu.org; 16 May 2023 13:49:00 +0000 Received: from localhost ([127.0.0.1]:45770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2w-0007e2-Sf for submit@debbugs.gnu.org; Tue, 16 May 2023 09:48:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2u-0007dS-Bx for 63527@debbugs.gnu.org; Tue, 16 May 2023 09:48:57 -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 1pyv2o-0004I4-Q9; Tue, 16 May 2023 09:48:50 -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=avtzZpJ7ustNEdjptt/ZkjSimTVwwmV5x6jPu6RskeM=; b=kBfWrfKUnhLyQLhwzc9+ 7E2E1iatuHEhDZpDNGieFitjJ0JnKECyj1NhNl022saoPLjJOaGxyw48n/NQsUpQRXtUcQ5zRMYPY /nmv+xBTaWlLZEa9Zp1xgJ25I7j85E5A/KwpoGvyf82pvMY8KXRh4U4TR6NZxouZD5vzl/eZMzUar HogbMc1MpLj4XCgPO+PX6lPpeAKvTL+ojzmZNn07bKMjAk5cRsHILmmZ+Ba9zNSKlowpHJDaa2J8J h0it4KBklKzBDlVzfv4mvUwURX2yL2XfLyiQs4+7weicMaR1cxp+Smm514wdQit2e4l2npZyH6IFL NxqGI+ZA60EJJQ==; 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 1pyv2o-00086i-Ak; Tue, 16 May 2023 09:48:50 -0400 From: Janneke Nieuwenhuizen Date: Tue, 16 May 2023 15:48:44 +0200 Message-Id: <8b12244dab33c893860c6247d96a595e0fb9a345.1684244425.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This uses Debian Salsa package management as upstream as that is where delopment happens. Once things have stabalized upstream may change to the NetBSD git from where Debian takes their snapshots. * gnu/packages/patches/rumpkernel-cross-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/hurd.scm (rumpkernel): Use it in new variable. --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 208 +++++++++++++++++- .../patches/rumpkernel-cross-build.patch | 153 +++++++++++++ 3 files changed, 361 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/rumpkernel-cross-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 012ce84d2d..0e394e5c36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1860,6 +1860,7 @@ dist_patch_DATA = \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \ %D%/packages/patches/rottlog-direntry.patch \ + %D%/packages/patches/rumpkernel-cross-build.patch \ %D%/packages/patches/ruby-hiredis-use-system-hiredis.patch \ %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \ %D%/packages/patches/ruby-anystyle-data-immutable-install.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 34c7c00f2d..8edf5d91c6 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018, 2020-2023 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Rene Saavedra ;;; @@ -662,3 +662,209 @@ (define-public netdde ;; Some drivers are dually licensed with the options being GPLv2 or one ;; of MPL/Expat/BSD-3 (dependent on the driver). (license gpl2)))) + +(define-public rumpkernel + (let ((commit "ec2ab9612be4dc48a316a21a0c96d3388478a064") + (revision "2")) + (package + (name "rumpkernel") + (version (git-version "0-20211031" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/hurd-team/rumpkernel.git") + (commit commit))) + (sha256 + (base32 + "1ypjg3jyzhh3gnanmk6fh76dwl5ml78n311nbi0hw7f7hygzn7vk")) + (file-name (git-file-name name commit)))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:modules '((srfi srfi-26) + (ice-9 match) + (ice-9 rdelim) + (guix build utils) + (guix build gnu-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patches + (lambda* (#:key target #:allow-other-keys) + (let* ((patch-directory "debian/patches/") + (series (string-append patch-directory "series")) + (text (with-input-from-file series read-string)) + (lines (string-split (string-trim-right text) #\newline)) + (patches (filter (negate (cute string-prefix? "#" <>)) + lines)) + (patch-files (map + (cute string-append patch-directory <>) + patches))) + (for-each + (cute invoke "patch" "--force" "-p1" "-i" <>) + patch-files) + ;; Somewhere in the build.sh/make process MIG is not being + ;; exported, apparently. + (when target + (substitute* "pci-userspace/src-gnu/Makefile.inc" + (("MIG=mig") + (string-append "MIG=" target "-mig"))))))) + (add-before 'configure 'setenv + (lambda* (#:key build target #:allow-other-keys) + (define (noisy-setenv name value) + (setenv name value) + (format (current-error-port) "set ~a=~s\n" name value)) + (noisy-setenv "HOST_CC" "gcc") + (when target + (noisy-setenv "MIG" (string-append target "-mig"))) + (let ((target (or target build))) + (noisy-setenv "TARGET_AR" (string-append target "-ar")) + (noisy-setenv "TARGET_CC" (string-append target "-gcc")) + (noisy-setenv "TARGET_CXX" (string-append target "-g++")) + (noisy-setenv "TARGET_LD" (string-append target "-ld")) + (noisy-setenv "TARGET_MIG" (string-append target "-mig")) + (noisy-setenv "TARGET_NM" (string-append target "-nm"))) + (setenv "PAWD" "pwd") + (for-each + (cute noisy-setenv <> "") + '("_GCC_CRTENDS" + "_GCC_CRTEND" + "_GCC_CRTBEGINS" + "_GCC_CRTBEGIN" + "_GCC_CRTI" + "_GCC_CRTN")) + (noisy-setenv "BSDOBJDIR=" (string-append (getcwd) "/obj")))) + (replace 'configure + (lambda args + (let ((configure (assoc-ref %standard-phases 'configure))) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (apply configure args))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (let* ((jobs (if parallel-build? (parallel-job-count) 1)) + (host-cpu (match #$(or (%current-target-system + (%current-system))) + ("i586-pc-gnu" "i386") + ("i686-linux" "i386") + ("x86_64-linux" "amd64"))) + (toprump (string-append + (getcwd) + "/buildrump.sh/src/sys/rump")) + (rump-make (string-append + (getcwd) + "/buildrump.sh/src/obj/tooldir/bin/nbmake-" + host-cpu))) + (mkdir "obj") + (with-directory-excursion "buildrump.sh/src" + (invoke + "sh" "build.sh" + "-V" "TOOLS_BUILDRUMP=yes" + "-V" "MKBINUTILS=no" + "-V" "MKGDB=no" + "-V" "MKGROFF=no" + "-V" (string-append "TOPRUMP=" toprump) + "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" + "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" + "-V" (string-append + "CPPFLAGS=" + " -I../../obj/destdir." host-cpu "/usr/include" + " -D_FILE_OFFSET_BITS=64" + " -DRUMP_REGISTER_T=int" + " -DRUMPUSER_CONFIG=yes" + " -DNO_PCI_MSI_MSIX=yes" + " -DNUSB_DMA=1") + "-V" (string-append + "CWARNFLAGS=" + " -Wno-error=maybe-uninitialized" + " -Wno-error=address-of-packed-member" + " -Wno-error=unused-variable" + " -Wno-error=stack-protector" + " -Wno-error=array-parameter" + " -Wno-error=array-bounds" + " -Wno-error=stringop-overflow") + "-V" "LIBCRTBEGIN=" + "-V" "LIBCRTEND=" + "-V" "LIBCRT0=" + "-V" "LIBCRTI=" + "-V" "_GCC_CRTENDS=" + "-V" "_GCC_CRTEND=" + "-V" "_GCC_CRTBEGINS=" + "-V" "_GCC_CRTBEGIN=" + "-V" "_GCC_CRTI=" + "-V" "_GCC_CRTN=" + "-U" + "-u" + "-T" "./obj/tooldir" + "-m" host-cpu + "-j" (number->string jobs) + "tools" + "rump")) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (setenv "RUMPRUN" "true") + (invoke rump-make "dependall")) + (with-directory-excursion "pci-userspace/src-gnu" + (invoke rump-make "dependall"))))) + (replace 'install + (lambda _ + (define (install-file file target) + (let ((dest (string-append target (basename file)))) + (format (current-output-port) "`~a' -> `~a'~%" file dest) + (mkdir-p (dirname dest)) + (if (file-exists? dest) + (format (current-error-port) + "warning: skipping: ~a\n" file) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest))))))) + (let ((header (string-append #$output "/include/rump")) + (lib (string-append #$output "/lib/"))) + (mkdir-p header) + (copy-recursively "buildrump.sh/src/sys/rump/include/rump" + header) + (mkdir-p lib) + (for-each + (cute install-file <> lib) + (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") + (find-files "obj" "librump.*[.](a|so.*)"))))))))) + (inputs + (list gnumach-headers libpciaccess)) + (native-inputs + (list + autoconf + automake + libgcrypt + (if (%current-target-system) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig) + zlib)) + (supported-systems %hurd-systems) + (home-page "https://wiki.netbsd.org/rumpkernel") + (synopsis "NetBSD as rumpkernel for the GNU/Hurd") + (description + "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that +the Hurd may be installed on iron. Using this rumpkernel package, the hurd +package's rumpdisk can be built which provides the pci.arbiter and rumpdisk +servers.") + (license (list + asl2.0 + boost1.0 + bsd-2 + bsd-3 + bsd-4 + cddl1.0 + expat + gpl1 + gpl2+ + gpl3+ + isc + lgpl2.0+ + public-domain + (@ (guix licenses) zlib) + (non-copyleft "file://src/lib/libc/hash/hashhl.c" + "See debian/copyright in the distribution.")))))) diff --git a/gnu/packages/patches/rumpkernel-cross-build.patch b/gnu/packages/patches/rumpkernel-cross-build.patch new file mode 100644 index 0000000000..a8c7d93e20 --- /dev/null +++ b/gnu/packages/patches/rumpkernel-cross-build.patch @@ -0,0 +1,153 @@ +This patch fixes cross-building the rumpkernel: + + * Fixes for non-multiarch toolchains, + * Support cross-mig, + * Cater for non-FHS .../bin/sh. + +Upstream status: not presented upstream. + +From 3e080e8a43f8b2f7a107849dd2e7e38ee2732d20 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Tue, 16 May 2023 07:29:23 +0200 +Subject: [PATCH 1/3] squash! patch: debian/patches/crossbuild + +--- + buildrump.sh/src/build.sh | 10 ++++++++-- + pci-userspace/src-gnu/Makefile.inc | 3 ++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/buildrump.sh/src/build.sh b/buildrump.sh/src/build.sh +index 60375f5f4..0e80813c1 100755 +--- a/buildrump.sh/src/build.sh ++++ b/buildrump.sh/src/build.sh +@@ -2230,12 +2230,18 @@ maketoolwrapper () + musthave=$1 + tool=$2 + +- if [ "${tool}" = "CC" ]; then ++ if [ "${tool}" = "AR" ]; then ++ lctool=${TARGET_AR-ar} ++ elif [ "${tool}" = "CC" ]; then + lctool=${TARGET_CC-gcc} + elif [ "${tool}" = "CXX" ]; then + lctool=${TARGET_CXX-g++} + elif [ "${tool}" = "LD" ]; then + lctool=${TARGET_LD-ld} ++ elif [ "${tool}" = "MIG" ]; then ++ lctool=${TARGET_MIG-mig} ++ elif [ "${tool}" = "NM" ]; then ++ lctool=${TARGET_NM-nm} + else + lctool=$(echo ${tool} | tr '[A-Z]' '[a-z]') + fi +@@ -2302,7 +2308,7 @@ makerumptools () + for x in CC AR NM OBJCOPY; do + maketoolwrapper true $x + done +- for x in AS LD OBJDUMP RANLIB READELF SIZE STRINGS STRIP CXX; do ++ for x in AS LD OBJDUMP RANLIB READELF SIZE STRINGS STRIP CXX MIG; do + maketoolwrapper false $x + done + +diff --git a/pci-userspace/src-gnu/Makefile.inc b/pci-userspace/src-gnu/Makefile.inc +index 6f8db357e..ef25bac3a 100644 +--- a/pci-userspace/src-gnu/Makefile.inc ++++ b/pci-userspace/src-gnu/Makefile.inc +@@ -8,11 +8,12 @@ RUMPCOMP_USER_CPPFLAGS+=-I${PCIDIR} -I${DESTDIR}/usr/include + RUMPCOMP_CPPFLAGS+= -I${PCIDIR} -I${DESTDIR}/usr/include + CPPFLAGS+= -I${PCIDIR} + LDFLAGS+= -lmachuser -Wl,--no-as-needed -lpciaccess -Wl,--as-needed ++MIG=mig + + mach_debugUser.c: + echo '#include ' \ + | ${CC} -E -x c - -o - \ +- | mig -cc cat - /dev/null -subrprefix __ \ ++ | $(MIG) -cc cat - /dev/null -subrprefix __ \ + -user mach_debugUser.c \ + -server /dev/null \ + -header mach_debug_U.h +-- +2.39.2 + +From af67549b7c5da5970a9330d281bd8305e1f6e8ed Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Tue, 16 May 2023 07:39:54 +0200 +Subject: [PATCH 2/3] crossbuild: Cater for non-FHS shell. + +--- + buildrump.sh/src/tools/genassym/Makefile | 2 +- + buildrump.sh/src/tools/lorder/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/buildrump.sh/src/tools/genassym/Makefile b/buildrump.sh/src/tools/genassym/Makefile +index e597c522b..96ca4ac21 100644 +--- a/buildrump.sh/src/tools/genassym/Makefile ++++ b/buildrump.sh/src/tools/genassym/Makefile +@@ -17,7 +17,7 @@ ${TIMESTAMP}: genassym + ${HOST_INSTALL_FILE} -m ${BINMODE} ${.ALLSRC} ${.TARGET} + + genassym: genassym.sh +- ${TOOL_SED} -e "s,/bin/sh,${HOST_BSHELL},g" \ ++ ${TOOL_SED} -e "s,\([ \!]\)/bin/sh,\1${HOST_BSHELL},g" \ + -e "s,{AWK:=.*},{AWK:="${TOOL_AWK:Q}"}," \ + < ${.ALLSRC} > ${.TARGET} + +diff --git a/buildrump.sh/src/tools/lorder/Makefile b/buildrump.sh/src/tools/lorder/Makefile +index f3c599e12..92af83d51 100644 +--- a/buildrump.sh/src/tools/lorder/Makefile ++++ b/buildrump.sh/src/tools/lorder/Makefile +@@ -17,7 +17,7 @@ ${TIMESTAMP}: lorder + ${HOST_INSTALL_FILE} -m ${BINMODE} ${.ALLSRC} ${.TARGET} + + lorder: lorder.sh +- ${TOOL_SED} -e "s,/bin/sh,"${HOST_BSHELL:Q}",g" \ ++ ${TOOL_SED} -e "s,\([ \!]\)/bin/sh,\1"${HOST_BSHELL:Q}",g" \ + -e "s,{JOIN:=.*},{JOIN:="${TOOL_JOIN:Q}"}," \ + -e "s,{MKTEMP:=.*},{MKTEMP:="${TOOL_MKTEMP:Q}"}," \ + -e "s,{NM:=.*},{NM:="${NM:Q}"}," \ +-- +2.39.2 + +From 9c8c93485e688bcc3db129bb56da03b18daae52c Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Tue, 16 May 2023 08:55:51 +0200 +Subject: [PATCH 3/3] squash! pci-userspace: Add acpi lookup of irqs with + fallback + +--- + debian/patches/acpi.diff | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/debian/patches/acpi.diff b/debian/patches/acpi.diff +index 8015a6e63..8e359b2c0 100644 +--- a/debian/patches/acpi.diff ++++ b/debian/patches/acpi.diff +@@ -1,6 +1,6 @@ + --- a/pci-userspace/src-gnu/Makefile.inc + +++ b/pci-userspace/src-gnu/Makefile.inc +-@@ -3,7 +3,7 @@ ++@@ -3,8 +3,8 @@ + PCIDIR:= ${.PARSEDIR} + .PATH: ${PCIDIR} + +@@ -9,6 +9,7 @@ + RUMPCOMP_USER_CPPFLAGS+=-I${PCIDIR} -I${DESTDIR}/usr/include + RUMPCOMP_CPPFLAGS+= -I${PCIDIR} -I${DESTDIR}/usr/include + CPPFLAGS+= -I${PCIDIR} ++ MIG=mig + @@ -16,3 +16,11 @@ + -user mach_debugUser.c \ + -server /dev/null \ +@@ -17,7 +18,7 @@ + +acpiUser.c: + + echo '#include ' \ + + | ${CC} -E -x c - -o - \ +-+ | mig -cc cat - /dev/null -subrprefix __ \ +++ | $(MIG) -cc cat - /dev/null -subrprefix __ \ + + -user acpiUser.c \ + + -server /dev/null \ + + -header acpi_U.h +-- +2.39.2 + -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v2 2/3] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 13:49:03 +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.168424494029408 (code B ref 63527); Tue, 16 May 2023 13:49:03 +0000 Received: (at 63527) by debbugs.gnu.org; 16 May 2023 13:49:00 +0000 Received: from localhost ([127.0.0.1]:45772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2x-0007eB-VW for submit@debbugs.gnu.org; Tue, 16 May 2023 09:49:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2u-0007dT-IU for 63527@debbugs.gnu.org; Tue, 16 May 2023 09:48:58 -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 1pyv2p-0004IF-CI; Tue, 16 May 2023 09:48:51 -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=oJlzhM2EtZTxYs9/OtZH9nYMALaefAyBMm3TTTXWNi0=; b=G1oEYXAL0DHPJDUkgnSN ypaaYWeNHacptbU9gfkZ7ku4vUMOfArprZw6HgecsIeeD7jSPyiL58au3yn1I/lNSTO6coYje4eGo JJ8NqvfZLk7bGU9TJZ2Ct34HigPkNs7YbwT8lJdIl9nPJekge57Li1tb/vGTxLB2guZ+MiqRrfsCS Pio20A7DMhRjXGOiJdDcXI/rsyULaN9nLL208Twp2ZMUmcnXzxjv8k1QOR6j2U5lBykHqJFaNxH5z zJQmx14c176JBvGBTHDwfU+7rfZ2mSofzeYr9yS2h/zyu63iEXj1ekMA6+4P5TiJsjdnO13yPEHPt Jh1GlcDqEiRhEA==; 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 1pyv2p-00086i-02; Tue, 16 May 2023 09:48:51 -0400 From: Janneke Nieuwenhuizen Date: Tue, 16 May 2023 15:48:45 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd)[inputs]: Add rumpkernel. [arguments]: Rename `prepare-dde' phase to 'prepare-addons'. Add "rumpdisk" directory. Add --enable-static-progs=... option to #:configure-flags. --- gnu/packages/hurd.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 8edf5d91c6..e419859c05 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -356,7 +356,7 @@ (define-public hurd (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-dde + (add-after 'unpack 'prepare-addons (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) @@ -370,7 +370,10 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit")))) + "libbpf libmachdevdde libddekit rumpdisk")) + (substitute* "rumpdisk/Makefile" + (("rumpdev_ahcisata" all) + (string-append all " rumpdev_ata"))))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -533,6 +536,7 @@ (define-public hurd #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi" "--disable-ncursesw" "--without-libbz2" "--without-libz" @@ -541,7 +545,11 @@ (define-public hurd ;; clnt_create "ac_func_search_save_LIBS=-ltirpc" "ac_cv_search_clnt_create=false" - "CFLAGS=-fcommon"))) + "CFLAGS=-fcommon") + #:make-flags + (list (string-append "RUMPPATH=" + (assoc-ref %build-inputs "rumpkernel") + "/lib")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) ;for /hurd/random @@ -557,7 +565,8 @@ (define-public hurd ("coreutils" ,coreutils) ("sed" ,sed) ("grep" ,grep) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux) + ("rumpkernel" ,rumpkernel))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v2 3/3] DRAFT system: hurd: Boot with pci.arbiter and rumpdisk. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 13:50:02 +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.168424494729463 (code B ref 63527); Tue, 16 May 2023 13:50:02 +0000 Received: (at 63527) by debbugs.gnu.org; 16 May 2023 13:49:07 +0000 Received: from localhost ([127.0.0.1]:45777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv34-0007f9-Dl for submit@debbugs.gnu.org; Tue, 16 May 2023 09:49:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyv2v-0007dW-5i for 63527@debbugs.gnu.org; Tue, 16 May 2023 09:48:58 -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 1pyv2p-0004IN-V1; Tue, 16 May 2023 09:48:51 -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=HiDTInrTu63V/Px0vRdE+BACW5iH9PypFWKCI0xPMvY=; b=ebKqFXPXwaEsgZv6l8Tt +KZVq6Mp+c+5UlTrj7EO4p/+m4YpLTAF8mmuo1+BeTQa4rSxVI08FVJPxiFByrTfcXnZvsDN+Su+a NUNvnQ5Y+W44q2GAhtK7LCOS679NPqIKybhIG7r0rYYeaxTSkDuytOFH9F1Ha8yYceoeb94SC4hk1 3rQq7zf2XQTvPXKKUdTsA4rN15GKKU+d3kHxszVKG2Yj6tdqdROA0QjxQhO88KAdZK9zYWQvzjtEq WvbZcbJrk3mCmKTAIrvCaFWI+9gdcX0B+33go7mva6OVmqlpuN0Tro7ZmCZyCYDz2IP5qJdJw/XJ5 fw4hK9R0s8EZ6w==; 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 1pyv2p-00086i-Ib; Tue, 16 May 2023 09:48:51 -0400 From: Janneke Nieuwenhuizen Date: Tue, 16 May 2023 15:48:46 +0200 Message-Id: <6ac4d3d9d5e19a86304e6bcefced3cf88462bbf5.1684244425.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) XXX This hangs at start pci.arbiter: * gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and rumpdisk. --- gnu/system.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..12e646ad51 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2022 Maxim Cournoyer -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework @@ -1486,16 +1486,28 @@ (define (operating-system-multiboot-modules os) (define (hurd-multiboot-modules os) (let* ((hurd (operating-system-hurd os)) + (pci-arbiter-command + (list (file-append hurd "/hurd/pci-arbiter.static") + "pci.arbiter" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--next-task='${disk-task}'" + "'$(pci-task=task-create)'" + "'$(task-resume)'")) + (rumpdisk-command + (list (file-append hurd "/hurd/rumpdisk.static") + "rumpdisk" + "--next-task='${fs-task}'" + "'$(disk-task=task-create)'")) (root-file-system-command (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" "--multiboot-command-line='${kernel-command-line}'" - "--host-priv-port='${host-port}'" - "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" "--x-xattr-translator-records" - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + "'${root}'" + "'$(fs-task=task-create)'")) (target (%current-target-system)) (libc (if target (with-parameters ((%current-target-system #f)) @@ -1512,7 +1524,10 @@ (define (hurd-multiboot-modules os) ;; (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'") (list (file-append hurd "/hurd/exec.static") "exec" "'$(exec-task=task-create)'"))) - (list root-file-system-command exec-server-command))) + (list pci-arbiter-command + rumpdisk-command + root-file-system-command + exec-server-command))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 2/7] gnu: hurd: Update libpciaccess to 0.17. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:02 +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.168439959710530 (code B ref 63527); Thu, 18 May 2023 08:47:02 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:37 +0000 Received: from localhost ([127.0.0.1]:51986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHR-0002jl-4d for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHO-0002j5-II for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:35 -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 1pzZH0-0006UG-6p; Thu, 18 May 2023 04:46:23 -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=eYdqnThgKZtKnJHHoyQE2dCFb7gc6ZI9QXi6SOQrGlc=; b=NN5oq/azQeUtaCltN8gl Tz8OciLjN1xLsvq4hGdtZ12T/nP3Pc8F/CbF/zvhH+oXFlzgA30KO7niWhMlGrh7b1imGgJ7+w901 T2NZvQjA1Hht7AR9kIIMQfncUnjomACPQa5FmoibdKVzlXeSRMwErqHZHEnhkKQW1Bb+Cv8/h9JVR N0XltjbVU02KcShehgURL7+buN7OgSo7heHTXKO6iBLvh+jDZ1LW02dfABikiAtm5rqA0Gama4Gvs 6FNOpyNr4zAe+RdxuRAio1m92R+rlZ1R1ZqeY8asSaUSIdLHqIGQU1ksPqv9bw0n4DZTzYf93OA6i sTKRIildL86Jng==; 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 1pzZGz-0005TJ-Od; Thu, 18 May 2023 04:46:10 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:46:00 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) As suggested by youpi on IRC https://logs.guix.gnu.org/hurd/2023-05-17.log#132259 libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific patches while libpciaccess-0.17 works out of the box. * gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17. (netdde)[inputs]: Likewise. --- gnu/packages/hurd.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 34c7c00f2d..da94b05272 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018, 2020-2023 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Rene Saavedra ;;; @@ -45,7 +45,7 @@ (define-module (gnu packages hurd) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) #:use-module (gnu packages onc-rpc) - #:use-module (gnu packages xorg) ; libpciaccess + #:use-module (gnu packages xorg) ;#:select (libpciaccess-0.17) #:use-module (guix git-download) #:export (hurd-system? hurd-target?)) @@ -547,7 +547,7 @@ (define-public hurd `(("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("unifont" ,unifont) - ("libpciaccess" ,libpciaccess) + ("libpciaccess" ,libpciaccess-0.17) ;; For NFS support ("libtirpc" ,libtirpc/hurd) @@ -645,7 +645,7 @@ (define-public netdde "/bin")) #t))))) (inputs - (list hurd libpciaccess zlib)) + (list hurd libpciaccess-0.17 zlib)) (native-inputs `(("coreutils" ,coreutils) ("gawk" ,gawk) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 0/7] Rumpdisk support for the Hurd References: In-Reply-To: Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:02 +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.168439960110547 (code B ref 63527); Thu, 18 May 2023 08:47:02 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:41 +0000 Received: from localhost ([127.0.0.1]:51988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHU-0002k1-Ov for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHP-0002jB-5U for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:36 -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 1pzZGy-0006UE-UR; Thu, 18 May 2023 04:46:24 -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:Subject:To:From:in-reply-to: references; bh=7HDYcBmG7Rxnu6i9pMHJMgrSne2b20nMS6qZ3w2hC6s=; b=bae0uXRIYWaQyS RQRVOkGx33LmmgUaOHsAuYfROvU8mrjMC0WJjIIJ4DELfmzb+l1tivn76rS+HqWhLT89N1GEfbMNo K4YiMu7dpqzFg96XKtJHhsPSM3ruVhy1qjMB4mK56sdM6UDDi9LNK49S9Awk8vFru8ALo9yUyXhHP Ks214WUbehVpASvo53bLciEd2IL0vbHlnf/+DgQ7tyPB9ieFikeSMmlG/bFm66hKxAf0KCQqnUPC0 MURD0L8tgz5sdwjsOnIL2+/IT78IAOSxXxrA1TYyNOgFORvStn4EiBbXDMJqJ/OLV0GtY7VGsiVT4 zlDACPltKSFkJQ+KH+UQ==; 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 1pzZGy-0005TJ-HN; Thu, 18 May 2023 04:46:08 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:45:58 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) So, good progress and amazing news since the v2 series: * Add libpciaccess-0.17, and * Use that for the Hurd, * Actually setup translators for pci.arbiter and rumpdisk, * For QEMU update the memory-size to 2048MB, and * Suggest to do so in our bare-hurd.tmpl example, and * It boots! \o/ I had a lot of kind debugging help from Samuel Thibault and Sergey Bugaev on libera.chat #hurd (https://logs.guix.gnu.org/hurd/2023-05-17.log#132259) as well as on the bug-hurd list (https://lists.gnu.org/archive/html/bug-hurd/2023-05//msg00326.html) to get here, thank you! With https://issues.guix.gnu.org/63501 by Josselin Poiret being merged yesterday and this patch series we now have Rumpkernel/rumpdisk support for the Hurd! I've now succesfully been doing something like --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix system image -t hurd-raw gnu/system/examples/bare-hurd.tmpl guix shell qemu -- qemu-system-i386 \ -m 4096 \ --enable-kvm \ --device rtl8139,netdev=net0 \ --netdev user,id=net0,hostfwd=tcp:0.0.0.0:11022-:2222 \ --snapshot \ --no-reboot \ --hda /gnu/store/r5dpblnfsj08jh3hdmn8s6l9xaczwn65-disk-image --8<---------------cut here---------------end--------------->8--- and ssh into the Hurd VM again. (Should we update the the Childhurds blogpost too, it suggest -m 512 https://guix.gnu.org/en/blog/2020/childhurds-and-substitutes/?) Greetings, Janneke Janneke Nieuwenhuizen (7): gnu: Add libpciaccess-0.17. gnu: hurd: Update libpciaccess to 0.17. gnu: Add rumpkernel. gnu: hurd: Add rumpkernel. hurd-boot: Setup pci-arbiter and rumpdisk translators. services: childhurd: Bump default qemu memory to 2048MB. system: hurd: Boot with pci.arbiter and rumpdisk. gnu/build/hurd-boot.scm | 10 +- gnu/packages/hurd.scm | 231 ++++++++++++++++++++++++++++- gnu/packages/xorg.scm | 17 +++ gnu/services/virtualization.scm | 4 +- gnu/system.scm | 25 +++- gnu/system/examples/bare-hurd.tmpl | 4 +- 6 files changed, 271 insertions(+), 20 deletions(-) base-commit: 5b700945fb0b33eec410de8979cae2fbf0d4f118 -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 1/7] gnu: Add libpciaccess-0.17. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:03 +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.168439960110553 (code B ref 63527); Thu, 18 May 2023 08:47:03 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:41 +0000 Received: from localhost ([127.0.0.1]:51990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHV-0002k4-6n for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHP-0002j8-5Q for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:36 -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 1pzZGz-0006UF-Ip; Thu, 18 May 2023 04:46:24 -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=TneORAR02LdkIBokw5aF7AijYxkgc9J8u0JqJ8Oyfdw=; b=JPTbTA4dSwOkhEspMNpM AF3/vcUXK5qg9xo26W+dfujXLwJqWd6627hvnjxiZKOGRKMzcJYUe2iBpyJ7h/IZnnLMSwwoeal2E iHxWHM8YFozpCmJh0qVxlp6/mCGP+3KApCbVJPtRzQpI02G/LV+CuJIfl3y50m/YyU76RwuskU8At 3/uLle1xH6VyHMIa50SMz5U3Gfc+ilBPpWju28nRv1khLjsVMvM3mmXBEQLFnmSk2TajJ5OCuoYkN rbDp0mrvxd0zH15jc41z85iStPK29vs/ftQcBurqFSwjkXVEl702r/WQb5ALZZoad141kwsCP7qti 67AZIUoqRMa7aw==; 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 1pzZGz-0005TJ-46; Thu, 18 May 2023 04:46:09 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:45:59 +0200 Message-Id: <5bfcf081db8cd1204903c10d809a6b2bcf7ac05c.1684398787.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/xorg.scm (libpciaccess-0.17): New variable. --- gnu/packages/xorg.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f3d30c0ff1..93a2cca15d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1145,6 +1146,22 @@ (define-public libpciaccess (description "Xorg Generic PCI access library.") (license license:x11))) +(define-public libpciaccess-0.17 + (package + (inherit libpciaccess) + (name "libpciaccess") + (version "0.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libpciaccess-" + version + ".tar.xz")) + (sha256 + (base32 + "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l")))))) + (define-public libpthread-stubs (package (name "libpthread-stubs") -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 5/7] hurd-boot: Setup pci-arbiter and rumpdisk translators. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:03 +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.168439960210561 (code B ref 63527); Thu, 18 May 2023 08:47:03 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:42 +0000 Received: from localhost ([127.0.0.1]:51992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHV-0002kF-LS for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHP-0002jA-C5 for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:36 -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 1pzZH2-0006UJ-5I; Thu, 18 May 2023 04:46:28 -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=zl/bUEIf0LqRdL7LWKulZB6Pk4FbZtCp59YHQEM4g3A=; b=YjsV+yECkEgXBtHJ/y6F BSbY4741UJrLSfgqqkrruLFN/8nQqFcPRDFM7pVMKNd274H/t2MY/ZBT4YWgrMScnHWFLtN6UMUpb g9O/EWKoZLU5Km5t/HFgsFt5gw3sWhFCCLP0NRUhSIcH4n8goStRN2Bxw/kGCFChVZb4AA6QOc7Tm kkCjG2OfS9yOjpmqFwP6pTQSPYR3IIH7rn//o1YqRob970L0WFH7Li0gvir4rL0NOL2TtJwtq6pkl wQX07s6CV5mHZzC7WTmSM+VoMLeYmq57LLvs1iilF+rHyaVUtTbIot4kjNZve9soYLlQU4+M2uY+U JAWMA4QTywnhFg==; 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 1pzZH1-0005TJ-Of; Thu, 18 May 2023 04:46:11 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:46:03 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Setup pci-arbiter and rumpdisk translators. --- gnu/build/hurd-boot.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 95c15907dd..25c8f0ea51 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020-2022 Ludovic Courtès -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,7 +105,7 @@ (define* (make-hurd-device-nodes #:optional (root "/")) ;; TODO: Set the 'gnu.translator' extended attribute for passive translator ;; settings? - ) + (mkdir-p (scope "servers/bus/pci"))) (define (passive-translator-xattr? file-name) "Return true if FILE-NAME has an extended @code{gnu.translator} attribute @@ -183,7 +183,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) (mkdir-p dir)))) (define servers - '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + '(("servers/bus/pci" ("/hurd/pci-arbiter")) + ("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) ("servers/crash-kill" ("/hurd/crash" "--kill")) ("servers/crash-suspend" ("/hurd/crash" "--suspend")) ("servers/password" ("/hurd/password")) @@ -213,6 +214,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) ;; 'fd_to_filename' in libc expects it. ("dev/fd" ("/hurd/magic" "--directory" "fd") #o555) + ("dev/rumpdisk"("/hurd/rumpdisk") #o660) + ;; Create a number of ttys; syslogd writes to tty12 by default. ;; FIXME: Creating /dev/tty12 leads the console client to switch to ;; tty12 when syslogd starts, which is confusing for users. Thus, do @@ -249,6 +252,7 @@ (define* (set-hurd-device-translators #:optional (root "/")) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) (false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash"))) + (false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk"))) ;; Make sure /etc/mtab is a symlink to /proc/mounts. (false-if-exception (delete-file (scope "etc/mtab"))) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 6/7] services: childhurd: Bump default qemu memory to 2048MB. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:04 +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.168439960210568 (code B ref 63527); Thu, 18 May 2023 08:47:04 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:42 +0000 Received: from localhost ([127.0.0.1]:51994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHW-0002kN-0u for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHP-0002j9-5T for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:36 -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 1pzZH2-0006UK-OB; Thu, 18 May 2023 04:46:28 -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=7ca3+qD7m2ueBebjxXDwIfUQ+t49Fn+m1ezMNqZa+8Q=; b=eIgeGJTorBSHDXQ73R8I 5OWeoVk72nu3QlFbmnuTtQtI3+7DPYxtrq8HwbryVLLP0Ga1O6NTlnSW828t3j7OSQcukA1Rfp7XG BPrCRjggmCpQefqofGj/+MwWzWf6pALtl9Fzrgnh2X92GmJsJI39LFbtlDOxBE5oeBewxNXSgUvEg F+hUEvk6NupMJf8n0johExdP66M/68I0byG7yG8NSwh9tJm1HSxLblGoYxNuqGBfEK6eC3QdvxrOf 9mdZVVUDGjWP4x+UiqBJnZfW7hWBo1Q3jRM7Q/qQfE9EhIwr5WnzaNSc1/jgW9hBe7AGPVH7SOr1t cE7WuQXEMH8d2g==; 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 1pzZH2-0005TJ-BI; Thu, 18 May 2023 04:46:12 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:46:04 +0200 Message-Id: <8495d642f70a1c9368bd64d71e9d878d80628b33.1684398787.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) When booting with pci-arbiter and rumpdisk and using 1024MB of memory for qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot messages. At least 1200MB is required, currently. * gnu/services/virtualization.scm ()[memory-size]: Bump to 2048. * gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too. Update example `guix system image' and "qemu" command lines too. --- gnu/services/virtualization.scm | 4 ++-- gnu/system/examples/bare-hurd.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 2e311e3813..886b73f8c7 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ryan Moe ;;; Copyright © 2018, 2020-2022 Ludovic Courtès -;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2021, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Timotej Lazar ;;; Copyright © 2022 Oleg Pykhalov ;;; Copyright © 2022 Leo Nikkilä @@ -1100,7 +1100,7 @@ (define-record-type* (disk-size hurd-vm-configuration-disk-size ;number or 'guess (default 'guess)) (memory-size hurd-vm-configuration-memory-size ;number - (default 512)) + (default 2048)) (options hurd-vm-configuration-options ;list of string (default `("--snapshot"))) (id hurd-vm-configuration-id ;#f or integer [1..] diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index f0dd0cf742..463c7ee798 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -5,12 +5,12 @@ ;; To build a disk image for a virtual machine, do ;; -;; ./pre-inst-env guix system image --target=i586-pc-gnu \ +;; ./pre-inst-env guix system image --image-type=hurd-raw \ ;; gnu/system/examples/bare-hurd.tmpl ;; ;; You may run it like so ;; -;; guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \ +;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \ ;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ ;; -snapshot -hda ;; -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 4/7] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:04 +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.168439960210576 (code B ref 63527); Thu, 18 May 2023 08:47:04 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:42 +0000 Received: from localhost ([127.0.0.1]:51996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHW-0002kU-HC for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHP-0002j3-Kc for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:40 -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 1pzZH1-0006UI-IU; Thu, 18 May 2023 04:46:28 -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=j3V/fbemwUhVUgTMAoECVJXtUrqoUyzUYYP/EDAI6y8=; b=Ho5a/ECLOLFWYDH+XVh1 ZpIj0iobDSCmJmGNTFWl/85QVT6xp8XXN+pZL+OzRVyKqEn8uJyO0aMEg50/OPCsqTN3nwJ/cVgsP eWSNPn9lI8i+rP8i6s0R1QOITRfrq7rppCypjkx3DpNYN9zJFn+xpBHsA/Sp4lAdusPZbdI3UP0y0 l4FtONpKxbDMeYQj8flNPBXFaJI9vzQlpWygSTVaQKFhVQPk1C4ww/TOao6iDdOl66pZbeVyX+xYh yqPx2a4x1bIcVFYpmDcAduMR+1kkYudYoh3NZehCF8jiTtYU91psfksxzjG56/uSvpXhc2SH0os0d teO7QrVmYqLIWg==; 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 1pzZH1-0005TJ-5b; Thu, 18 May 2023 04:46:11 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:46:02 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd)[inputs]: Add rumpkernel. [arguments]: Rename `prepare-dde' phase to 'prepare-addons'. Add "rumpdisk" directory. Add --enable-static-progs=... option to #:configure-flags. --- gnu/packages/hurd.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index c7ea86b266..aaa9863a10 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -356,7 +356,7 @@ (define-public hurd (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-dde + (add-after 'unpack 'prepare-addons (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) @@ -370,7 +370,10 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit")))) + "libbpf libmachdevdde libddekit rumpdisk")) + (substitute* "rumpdisk/Makefile" + (("rumpdev_ahcisata" all) + (string-append all " rumpdev_ata"))))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -533,6 +536,7 @@ (define-public hurd #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi" "--disable-ncursesw" "--without-libbz2" "--without-libz" @@ -541,7 +545,11 @@ (define-public hurd ;; clnt_create "ac_func_search_save_LIBS=-ltirpc" "ac_cv_search_clnt_create=false" - "CFLAGS=-fcommon"))) + "CFLAGS=-fcommon") + #:make-flags + (list (string-append "RUMPPATH=" + (assoc-ref %build-inputs "rumpkernel") + "/lib")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) ;for /hurd/random @@ -557,7 +565,8 @@ (define-public hurd ("coreutils" ,coreutils) ("sed" ,sed) ("grep" ,grep) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux) + ("rumpkernel" ,rumpkernel))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 3/7] gnu: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:05 +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.168439961210609 (code B ref 63527); Thu, 18 May 2023 08:47:05 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:52 +0000 Received: from localhost ([127.0.0.1]:52000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHf-0002l1-TI for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHP-0002j4-LL for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:43 -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 1pzZH0-0006UH-VT; Thu, 18 May 2023 04:46:21 -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=rDUwo9jyM14qcCRHiJja2XQuusOMr2fbjILphkyXf9w=; b=qPEsLqMS1cLL0VcekeH+ obRI9psnFz0LFIRGesbdvipywkD33Npo61fxK/qiwxVIARlPCU05Sohy/QqvA2OGIl2RGp5ZvQHvo nrFMHL1hNssCLbkd27aoG79jsHlt7Z99pLPC+t1CnbRK18L/w7yGoOM7mZH6InvtJs4a5aDZ4A6hb Zk6cYzrybICCFRfE+9mB9Rexlqrrdic864zHtl17W7BBrenaYelkj4qjZJeRgBdUdF4vVq9oTH/f9 vuNE/HiBB7en0Wr7ZH1TvRxSxhsqMWfelDRuY5TQtq+WBfTQsJTdFSzNykgOkZd0G2EjoYkaPmHAa zhFdqfaUAP3vng==; 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 1pzZH0-0005TJ-Co; Thu, 18 May 2023 04:46:10 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:46:01 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This uses the Debian Salsa rumpkernel package git as upstream as that is where delopment happens. Once things have stabalized upstream may change to the NetBSD git from where Debian takes their snapshots. * gnu/packages/hurd.scm (rumpkernel): New variable. --- gnu/packages/hurd.scm | 206 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index da94b05272..c7ea86b266 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -662,3 +662,209 @@ (define-public netdde ;; Some drivers are dually licensed with the options being GPLv2 or one ;; of MPL/Expat/BSD-3 (dependent on the driver). (license gpl2)))) + +(define-public rumpkernel + (let ((commit "ec2ab9612be4dc48a316a21a0c96d3388478a064") + (revision "2")) + (package + (name "rumpkernel") + (version (git-version "0-20211031" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/hurd-team/rumpkernel.git") + (commit commit))) + (sha256 + (base32 + "1ypjg3jyzhh3gnanmk6fh76dwl5ml78n311nbi0hw7f7hygzn7vk")) + (file-name (git-file-name name commit)))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:modules '((srfi srfi-26) + (ice-9 match) + (ice-9 rdelim) + (guix build utils) + (guix build gnu-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patches + (lambda* (#:key target #:allow-other-keys) + (let* ((patch-directory "debian/patches/") + (series (string-append patch-directory "series")) + (text (with-input-from-file series read-string)) + (lines (string-split (string-trim-right text) #\newline)) + (patches (filter (negate (cute string-prefix? "#" <>)) + lines)) + (patch-files (map + (cute string-append patch-directory <>) + patches))) + (for-each + (cute invoke "patch" "--force" "-p1" "-i" <>) + patch-files) + ;; Somewhere in the build.sh/make process MIG is not being + ;; exported, apparently. + (when target + (substitute* "pci-userspace/src-gnu/Makefile.inc" + (("MIG=mig") + (string-append "MIG=" target "-mig"))))))) + (add-before 'configure 'setenv + (lambda* (#:key build target #:allow-other-keys) + (define (noisy-setenv name value) + (setenv name value) + (format (current-error-port) "set ~a=~s\n" name value)) + (noisy-setenv "HOST_CC" "gcc") + (when target + (noisy-setenv "MIG" (string-append target "-mig"))) + (let ((target (or target build))) + (noisy-setenv "TARGET_AR" (string-append target "-ar")) + (noisy-setenv "TARGET_CC" (string-append target "-gcc")) + (noisy-setenv "TARGET_CXX" (string-append target "-g++")) + (noisy-setenv "TARGET_LD" (string-append target "-ld")) + (noisy-setenv "TARGET_MIG" (string-append target "-mig")) + (noisy-setenv "TARGET_NM" (string-append target "-nm"))) + (setenv "PAWD" "pwd") + (for-each + (cute noisy-setenv <> "") + '("_GCC_CRTENDS" + "_GCC_CRTEND" + "_GCC_CRTBEGINS" + "_GCC_CRTBEGIN" + "_GCC_CRTI" + "_GCC_CRTN")) + (noisy-setenv "BSDOBJDIR=" (string-append (getcwd) "/obj")))) + (replace 'configure + (lambda args + (let ((configure (assoc-ref %standard-phases 'configure))) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (apply configure args))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (let* ((jobs (if parallel-build? (parallel-job-count) 1)) + (host-cpu (match #$(or (%current-target-system + (%current-system))) + ("i586-pc-gnu" "i386") + ("i686-linux" "i386") + ("x86_64-linux" "amd64"))) + (toprump (string-append + (getcwd) + "/buildrump.sh/src/sys/rump")) + (rump-make (string-append + (getcwd) + "/buildrump.sh/src/obj/tooldir/bin/nbmake-" + host-cpu))) + (mkdir "obj") + (with-directory-excursion "buildrump.sh/src" + (invoke + "sh" "build.sh" + "-V" "TOOLS_BUILDRUMP=yes" + "-V" "MKBINUTILS=no" + "-V" "MKGDB=no" + "-V" "MKGROFF=no" + "-V" (string-append "TOPRUMP=" toprump) + "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" + "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" + "-V" (string-append + "CPPFLAGS=" + " -I../../obj/destdir." host-cpu "/usr/include" + " -D_FILE_OFFSET_BITS=64" + " -DRUMP_REGISTER_T=int" + " -DRUMPUSER_CONFIG=yes" + " -DNO_PCI_MSI_MSIX=yes" + " -DNUSB_DMA=1") + "-V" (string-append + "CWARNFLAGS=" + " -Wno-error=maybe-uninitialized" + " -Wno-error=address-of-packed-member" + " -Wno-error=unused-variable" + " -Wno-error=stack-protector" + " -Wno-error=array-parameter" + " -Wno-error=array-bounds" + " -Wno-error=stringop-overflow") + "-V" "LIBCRTBEGIN=" + "-V" "LIBCRTEND=" + "-V" "LIBCRT0=" + "-V" "LIBCRTI=" + "-V" "_GCC_CRTENDS=" + "-V" "_GCC_CRTEND=" + "-V" "_GCC_CRTBEGINS=" + "-V" "_GCC_CRTBEGIN=" + "-V" "_GCC_CRTI=" + "-V" "_GCC_CRTN=" + "-U" + "-u" + "-T" "./obj/tooldir" + "-m" host-cpu + "-j" (number->string jobs) + "tools" + "rump")) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (setenv "RUMPRUN" "true") + (invoke rump-make "dependall")) + (with-directory-excursion "pci-userspace/src-gnu" + (invoke rump-make "dependall"))))) + (replace 'install + (lambda _ + (define (install-file file target) + (let ((dest (string-append target (basename file)))) + (format (current-output-port) "`~a' -> `~a'~%" file dest) + (mkdir-p (dirname dest)) + (if (file-exists? dest) + (format (current-error-port) + "warning: skipping: ~a\n" file) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest))))))) + (let ((header (string-append #$output "/include/rump")) + (lib (string-append #$output "/lib/"))) + (mkdir-p header) + (copy-recursively "buildrump.sh/src/sys/rump/include/rump" + header) + (mkdir-p lib) + (for-each + (cute install-file <> lib) + (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") + (find-files "obj" "librump.*[.](a|so.*)"))))))))) + (inputs + (list gnumach-headers libpciaccess-0.17)) + (native-inputs + (list + autoconf + automake + libgcrypt + (if (%current-target-system) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig) + zlib)) + (supported-systems %hurd-systems) + (home-page "https://wiki.netbsd.org/rumpkernel") + (synopsis "NetBSD as rumpkernel for the GNU/Hurd") + (description + "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that +the Hurd may be installed on iron. Using this rumpkernel package, the hurd +package's rumpdisk can be built which provides the pci.arbiter and rumpdisk +servers.") + (license (list + asl2.0 + boost1.0 + bsd-2 + bsd-3 + bsd-4 + cddl1.0 + expat + gpl1 + gpl2+ + gpl3+ + isc + lgpl2.0+ + public-domain + (@ (guix licenses) zlib) + (non-copyleft "file://src/lib/libc/hash/hashhl.c" + "See debian/copyright in the distribution.")))))) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 7/7] system: hurd: Boot with pci.arbiter and rumpdisk. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 08:47:05 +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.168439961310616 (code B ref 63527); Thu, 18 May 2023 08:47:05 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 08:46:53 +0000 Received: from localhost ([127.0.0.1]:52002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHg-0002l4-GT for submit@debbugs.gnu.org; Thu, 18 May 2023 04:46:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZHO-0002j6-IJ for 63527@debbugs.gnu.org; Thu, 18 May 2023 04:46:48 -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 1pzZH3-0006UL-ER; Thu, 18 May 2023 04:46:24 -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=sSJfa0BztPSqifWm50KJnKP5djVPoVLoa+DKArt/AhY=; b=rMWrywxvsbcm085SxSVo Mkg4TTz9nYjorF0DEsjDslfyYgXrgIC8ilT+1Xd4BkvZYNVf/IfrvbbQMFYdx3nw+PGW8Wb/Wlupo ox6ZbD4y/8XA4GlrqEgeDoTsoQtcK8yhL2R3VlkI42U9yxQyx/aV5G9AVPlt73jzaPZirROAFnOsc /TgGyahCcewbEl3kz173O38/NIBXVKRKgm6aiwtJIDgL3IpWzijCHGuUnjWZfcAOlxX6eQBUnX2eo fEA3cWJzwns/GSAiCyVfWYdNqpADHgLwYDqSXCXCwwfI6yzhBoApD6H0nuLFnN1sM6h2Kd7934HOU qfNJ4RJ+Q7Ns6w==; 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 1pzZH2-0005TJ-Tr; Thu, 18 May 2023 04:46:13 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 10:46:05 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Be sure to give the Hurd enough (virtual) memory * gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and rumpdisk. --- gnu/system.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..23addf41e9 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2022 Maxim Cournoyer -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework @@ -1486,16 +1486,28 @@ (define (operating-system-multiboot-modules os) (define (hurd-multiboot-modules os) (let* ((hurd (operating-system-hurd os)) + (pci-arbiter-command + (list (file-append hurd "/hurd/pci-arbiter.static") + "pci-arbiter" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--next-task='${disk-task}'" + "'$(pci-task=task-create)'" + "'$(task-resume)'")) + (rumpdisk-command + (list (file-append hurd "/hurd/rumpdisk.static") + "rumpdisk" + "--next-task='${fs-task}'" + "'$(disk-task=task-create)'")) (root-file-system-command (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" "--multiboot-command-line='${kernel-command-line}'" - "--host-priv-port='${host-port}'" - "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" "--x-xattr-translator-records" - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + "'${root}'" + "'$(fs-task=task-create)'")) (target (%current-target-system)) (libc (if target (with-parameters ((%current-target-system #f)) @@ -1512,7 +1524,10 @@ (define (hurd-multiboot-modules os) ;; (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'") (list (file-append hurd "/hurd/exec.static") "exec" "'$(exec-task=task-create)'"))) - (list root-file-system-command exec-server-command))) + (list pci-arbiter-command + rumpdisk-command + root-file-system-command + exec-server-command))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v3 0/7] Rumpdisk support for the Hurd Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:15:01 +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.168440127914079 (code B ref 63527); Thu, 18 May 2023 09:15:01 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:14:39 +0000 Received: from localhost ([127.0.0.1]:52035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZiZ-0003f1-DT for submit@debbugs.gnu.org; Thu, 18 May 2023 05:14:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzZiU-0003eh-LT for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:14:38 -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 1pzZiN-0002S9-LR; Thu, 18 May 2023 05:14:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=er+TdZNu0O501qUNMY89t95VF3wZSTCSHR3IUa88sA0=; b=CAIPVJW3xhMrbhza0e2F L9PaQoWykSSmhAIuouFgEGAamR7oWg/uLvUoXjoZL5J+SVok6vWbNd2ukJBxil5T/SBtJ/oJAege1 xjFaKKcNVy18iOuNqt9SE2jxc1qGYpdr/bZsVy985NvRXC7zCNK1QgPnhB1vFDII1kGyrNZn2vBGS nlX99yKarsb4w1VY9woSyLlr/leWWVYtVxelAq+kwO6DWgnBSR0/BwQI7Nda+Xo3GBVN92+dcxJ8C 57GtnPKCCVXDhwowm0PDKqQlgarcdToNa1HgkYcpYoptQ90zNgRkPBLqKou30hhtGRG2q8UD8sXYF ADNhm5bS9B7M2w==; Received: from [2a02:a462:da03:1:2701:7f81:a736:4607] (helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzZiM-0005WY-WF; Thu, 18 May 2023 05:14:27 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Thu, 18 May 2023 11:14:12 +0200 In-Reply-To: (Janneke Nieuwenhuizen's message of "Thu, 18 May 2023 10:45:58 +0200") Message-ID: <87fs7ugfx7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: > So, good progress and amazing news since the v2 series: Oops, there is still good news, but the updated MONOTONIC (and possibly centiseconds) time patches from Debian Salsa are still needed! In testing with all different builds I must have confused myself in the final test, sorry! Anyway, the rest of the story and the good news still holds, we just need another ugly cross-glibc patch for the Hurd. I'll be preparing a new patch series. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 0/8] Rumpdisk support for the Hurd, really! References: In-Reply-To: Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:02 +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.168440276816400 (code B ref 63527); Thu, 18 May 2023 09:40:02 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:28 +0000 Received: from localhost ([127.0.0.1]:52060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6Z-0004GR-Co for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6X-0004Fp-BG for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:25 -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 1pza6R-0006LV-LM; Thu, 18 May 2023 05:39:19 -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:Subject:To:From:in-reply-to: references; bh=lYlWzTUq3QXpAxcg53lDpSYFQH30aqAlzqCO1UxHfcQ=; b=IOre40fa5NY1tO WrrF9oO9uWvJRPMzl0vHIo1j6DzawL3fmfGqZWqC2uvKWeyVV1obhVB1+9kExwID8J3kFYlC7reG5 3t5AXANEULGitEA/s3ewFf7DQ/rJxc30R8BgdLxcL4ntyunatc85PapV53IoXBQCr3vxmMAJ1kfTR exzmlNGPc1SKxIaCQiFsMH3DgO7tqUhbNmCmNpMuHB84hnb/iIzTJmNhJN11cT9hn0OcnBv0tSwkJ bRWjwRE2GCYugIfkml0KvNFBMNuMNCsRcbVq5kWkOXHLa+Kd1vLqyswTZcHrRvN2vvTLgyLA7LiFu OV2ANCTqKg2/WIr8MxWw==; Received: from [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 1pza6Q-0006zE-8l; Thu, 18 May 2023 05:39:19 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:38:55 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Most everything mentioned in the v3 patch series still holds, apart from the little fact that the rumpkernel will panic unless we use the complete time patches from Debian Salsa glibc package management, as was discussed/suggested on IRC by youpi: https://logs.guix.gnu.org/hurd/2023-05-17.log#150916 So one additional patch for cross-glibc, no changes in any of the patches since v3. Greetings, Janneke Janneke Nieuwenhuizen (8): gnu: glibc: Update time patches for the Hurd. gnu: Add libpciaccess-0.17. gnu: hurd: Update libpciaccess to 0.17. gnu: Add rumpkernel. gnu: hurd: Add rumpkernel. hurd-boot: Setup pci-arbiter and rumpdisk translators. services: childhurd: Bump default qemu memory to 2048MB. system: hurd: Boot with pci.arbiter and rumpdisk. gnu/build/hurd-boot.scm | 10 +- gnu/local.mk | 2 + gnu/packages/cross-base.scm | 34 ++- gnu/packages/hurd.scm | 231 +++++++++++++++++- ...bc-2.35-hurd-clock_gettime_monotonic.patch | 137 +++++++++++ ...glibc-2.35-hurd-clock_t_centiseconds.patch | 63 +++++ gnu/packages/xorg.scm | 17 ++ gnu/services/virtualization.scm | 4 +- gnu/system.scm | 25 +- gnu/system/examples/bare-hurd.tmpl | 4 +- 10 files changed, 504 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch create mode 100644 gnu/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch base-commit: 5b700945fb0b33eec410de8979cae2fbf0d4f118 -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 2/8] gnu: Add libpciaccess-0.17. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:02 +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.168440277216433 (code B ref 63527); Thu, 18 May 2023 09:40:02 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:32 +0000 Received: from localhost ([127.0.0.1]:52070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6e-0004Gy-2W for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6Y-0004Fs-1n for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:26 -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 1pza6S-0006M4-S2; Thu, 18 May 2023 05:39:20 -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=TneORAR02LdkIBokw5aF7AijYxkgc9J8u0JqJ8Oyfdw=; b=F+uVDZSmFTRbTcD1VWst mazp8AvllgmRLuCdxe+nsD5NMROykZjQC+FmQwSvEC+0TGqzHB+Ecnxzd1nXcd1xOJ1gMhMuve7/X WCPsxJ6LZ37iQKD7LJ5rbGECC4S5tWJr91RbVyCMnROc7tRU8UVW5fQWg1SRDH6UgUCrhIm83uSV8 ZAEoRKGsZmCDzXqOv4SwdBeZEXsk5UyRKPqW1rdMxmnMU3UmjMAnD0YT01zoZ8VmjVLsVCMZ7y9Gs uKX8QDOJjh2FmP5CAIcqLdVwF+wU8cBiSBDKSGV5APBNplQeiefHja/xP/8SO4D8C0NvIk84Pz/Z7 XLc3uDbsLUxAXw==; Received: from [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 1pza6S-0006zE-E7; Thu, 18 May 2023 05:39:20 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:38:57 +0200 Message-Id: <4e5f6c1005fad11cba2aa0078d7820874ce60477.1684402361.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/xorg.scm (libpciaccess-0.17): New variable. --- gnu/packages/xorg.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f3d30c0ff1..93a2cca15d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1145,6 +1146,22 @@ (define-public libpciaccess (description "Xorg Generic PCI access library.") (license license:x11))) +(define-public libpciaccess-0.17 + (package + (inherit libpciaccess) + (name "libpciaccess") + (version "0.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libpciaccess-" + version + ".tar.xz")) + (sha256 + (base32 + "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l")))))) + (define-public libpthread-stubs (package (name "libpthread-stubs") -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 3/8] gnu: hurd: Update libpciaccess to 0.17. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:03 +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.168440277316441 (code B ref 63527); Thu, 18 May 2023 09:40:03 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:33 +0000 Received: from localhost ([127.0.0.1]:52072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6e-0004H0-Ge for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6Y-0004Ft-LC for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:27 -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 1pza6T-0006MF-Eg; Thu, 18 May 2023 05:39:21 -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=eYdqnThgKZtKnJHHoyQE2dCFb7gc6ZI9QXi6SOQrGlc=; b=f6I/cvqgvhqPJqxAlBy5 U4k0Cyi3ggxPxBh9CWjhVBEljp91fcx4seIaHjvXZ2FEJasOecOwZQmmCEbD46SAiAo0gowWoJNHK DJFiWU5Ng37KXoKhCxxIrfntXM9hqwwIfZZlwS7g6Eb6HAXxAMENT4PriGeZ1/4fBw7AGa4TUGe42 /tMq2DMkqy+mxoXwQGIajCZP7sc/5dfq8tK1Jy5tsAWRY8eaxrzJ2DRmhbKU/QqwrmVRrkz7NzsBH DyJclexcgqlpNGNEJnPtIz5a+szYOCD9UTAqGcMf0NJOpuTICBp3B7LAtVaFMQrZfFW/OA6EEPShW t4zqB6qsRRYXZQ==; Received: from [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 1pza6T-0006zE-23; Thu, 18 May 2023 05:39:21 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:38:58 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) As suggested by youpi on IRC https://logs.guix.gnu.org/hurd/2023-05-17.log#132259 libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific patches while libpciaccess-0.17 works out of the box. * gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17. (netdde)[inputs]: Likewise. --- gnu/packages/hurd.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 34c7c00f2d..da94b05272 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018, 2020-2023 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Rene Saavedra ;;; @@ -45,7 +45,7 @@ (define-module (gnu packages hurd) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) #:use-module (gnu packages onc-rpc) - #:use-module (gnu packages xorg) ; libpciaccess + #:use-module (gnu packages xorg) ;#:select (libpciaccess-0.17) #:use-module (guix git-download) #:export (hurd-system? hurd-target?)) @@ -547,7 +547,7 @@ (define-public hurd `(("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("unifont" ,unifont) - ("libpciaccess" ,libpciaccess) + ("libpciaccess" ,libpciaccess-0.17) ;; For NFS support ("libtirpc" ,libtirpc/hurd) @@ -645,7 +645,7 @@ (define-public netdde "/bin")) #t))))) (inputs - (list hurd libpciaccess zlib)) + (list hurd libpciaccess-0.17 zlib)) (native-inputs `(("coreutils" ,coreutils) ("gawk" ,gawk) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 1/8] gnu: glibc: Update time patches for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:03 +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.168440277416449 (code B ref 63527); Thu, 18 May 2023 09:40:03 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:34 +0000 Received: from localhost ([127.0.0.1]:52074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6f-0004H8-0J for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6X-0004Fq-IE for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:27 -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 1pza6S-0006Lg-8P; Thu, 18 May 2023 05:39:20 -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=UyLneYz2641H4vD6LgVR1i4iE0THdcMQs13U/rzhrgc=; b=WGyF+se8w/M8BU5F5pKZ Wcq950Hug+bwIvrR5dJA17bqifQWPAiRwc7T42YPVXL9UBbcWowpEA3p+T+K+ky8vIQrrJIfzLAHU WMD6/+070/cAOOZmYkvhEK3ixH55ap7KevOAUfPrYqSWNDRL/IPPhSofI41gn9dxn7wLkurM7/dmX 31rLcl/fL2+ZL9ywxXkxrWkjhYrezszIEC2cAIUMqmciA1CJsak6zjOFkhlq5P2vSgSzPN3KQqFI5 OTZunQPGfLAkNSdCKUhJgtQ5J9RPHeGnmBqZWofVbT+7cUv6Qj8RNAm4Szx6yZuTSTUQVFJ+mLpCm BKQsYw3jSG2AgA==; Received: from [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 1pza6R-0006zE-RK; Thu, 18 May 2023 05:39:20 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:38:56 +0200 Message-Id: <23790bf9a3383c0adf74ec209eb9222c410f667b.1684402361.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The previous set of time patches were adapted from the Debian Salsa glibc package git and were needed only to get Python to build. The rumpkernel needs the full versions of those patches, with the current set causes a rumpkernel panic. As discussed/suggested on IRC https://logs.guix.gnu.org/hurd/2023-05-17.log#150916 * gnu/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch, gnu/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch: New files. * gnu/packages/cross-base.scm (cross-libc*)[native-inputs]: Add them, together with their incorrect/incomplete already applied versions. [arguments]: Use them in a new patch-libc/hurd phase: revert the incorrect ones and apply the new patches. --- gnu/local.mk | 2 + gnu/packages/cross-base.scm | 34 ++++- ...bc-2.35-hurd-clock_gettime_monotonic.patch | 137 ++++++++++++++++++ ...glibc-2.35-hurd-clock_t_centiseconds.patch | 63 ++++++++ 4 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch create mode 100644 gnu/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch diff --git a/gnu/local.mk b/gnu/local.mk index 42514ded8e..c5b3568742 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1233,6 +1233,8 @@ dist_patch_DATA = \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ + %D%/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch \ + %D%/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ %D%/packages/patches/glibc-CVE-2019-9169.patch \ %D%/packages/patches/glibc-CVE-2019-19126.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 8d0b41180b..c8d1aef814 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver -;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2016, 2019, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Marius Bakke @@ -624,7 +624,22 @@ (define* (cross-libc* target (("/[^ ]+/lib/libc.so.0.3") (string-append out "/lib/libc.so.0.3" " libmachuser.so libhurduser.so")))) - #t))) + #t)) + ;; TODO: move to glibc in the next rebuild cycle + (add-after 'unpack 'patch-libc/hurd + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (name) + (let ((patch (assoc-ref inputs name))) + (invoke "patch" "-p1" "--force" "-R" "-i" patch))) + '("hurd-monotonic.patch" + "hurd-centiseconds.patch")) + (for-each + (lambda (name) + (let ((patch (assoc-ref inputs name))) + (invoke "patch" "-p1" "--force" "-i" patch))) + '("2.35-hurd-centiseconds.patch" + "2.35-hurd-monotonic.patch"))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the @@ -637,7 +652,20 @@ (define* (cross-libc* target `(("cross-mig" ,(cross-mig target #:xgcc xgcc - #:xbinutils xbinutils))) + #:xbinutils xbinutils)) + ;; TODO: move to glibc in the next rebuild cycle + ("hurd-monotonic.patch" + ,@(search-patches + "glibc-hurd-clock_gettime_monotonic.patch")) + ("hurd-centiseconds.patch" + ,@(search-patches + "glibc-hurd-clock_t_centiseconds.patch")) + ("2.35-hurd-monotonic.patch" + ,@(search-patches + "glibc-2.35-hurd-clock_gettime_monotonic.patch")) + ("2.35-hurd-centiseconds.patch" + ,@(search-patches + "glibc-2.35-hurd-clock_t_centiseconds.patch"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc)))))) diff --git a/gnu/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch b/gnu/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch new file mode 100644 index 0000000000..05769d61b9 --- /dev/null +++ b/gnu/packages/patches/glibc-2.35-hurd-clock_gettime_monotonic.patch @@ -0,0 +1,137 @@ +Upstream status: taken from upstream: + + https://salsa.debian.org/glibc-team/glibc/-/blob/sid/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff + +Use the realtime clock for the monotonic clock. This is of course not a proper +implementation (which is being done in Mach), but will permit to fix at least +the iceweasel stack. + +vlc however doesn't build when _POSIX_CLOCK_SELECTION is enabled but +_POSIX_TIMERS is not, and they refuse to fix that (see #765578), so disable the +former. + +--- + sysdeps/mach/hurd/bits/posix_opt.h | 2 +- + sysdeps/unix/clock_gettime.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Index: glibc-2.27/sysdeps/mach/clock_gettime.c +=================================================================== +--- glibc-2.27.orig/sysdeps/mach/clock_gettime.c ++++ glibc-2.27/sysdeps/mach/clock_gettime.c +@@ -31,6 +31,10 @@ __clock_gettime (clockid_t clock_id, str + switch (clock_id) { + + case CLOCK_REALTIME: ++ case CLOCK_MONOTONIC: ++ case CLOCK_MONOTONIC_RAW: ++ case CLOCK_REALTIME_COARSE: ++ case CLOCK_MONOTONIC_COARSE: + { + /* __host_get_time can only fail if passed an invalid host_t. + __mach_host_self could theoretically fail (producing an +Index: glibc-2.27/rt/timer_create.c +=================================================================== +--- glibc-2.27.orig/rt/timer_create.c ++++ glibc-2.27/rt/timer_create.c +@@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct + return -1; + } + +- if (clock_id != CLOCK_REALTIME) ++ if (clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_MONOTONIC_RAW && clock_id != CLOCK_REALTIME_COARSE && clock_id != CLOCK_MONOTONIC_COARSE) + { + __set_errno (EINVAL); + return -1; +Index: glibc-2.27/sysdeps/mach/hurd/bits/posix_opt.h +=================================================================== +--- glibc-2.27.orig/sysdeps/mach/hurd/bits/posix_opt.h ++++ glibc-2.27/sysdeps/mach/hurd/bits/posix_opt.h +@@ -163,10 +163,10 @@ + #define _POSIX_THREAD_PROCESS_SHARED -1 + + /* The monotonic clock might be available. */ +-#define _POSIX_MONOTONIC_CLOCK 0 ++#define _POSIX_MONOTONIC_CLOCK 200809L + +-/* The clock selection interfaces are available. */ +-#define _POSIX_CLOCK_SELECTION 200809L ++/* The clock selection interfaces are not really available yet. */ ++#define _POSIX_CLOCK_SELECTION -1 + + /* Advisory information interfaces could be available in future. */ + #define _POSIX_ADVISORY_INFO 0 +Index: glibc-upstream/sysdeps/posix/clock_getres.c +=================================================================== +--- glibc-upstream.orig/sysdeps/posix/clock_getres.c ++++ glibc-upstream/sysdeps/posix/clock_getres.c +@@ -52,6 +52,10 @@ __clock_getres (clockid_t clock_id, stru + switch (clock_id) + { + case CLOCK_REALTIME: ++ case CLOCK_MONOTONIC: ++ case CLOCK_MONOTONIC_RAW: ++ case CLOCK_REALTIME_COARSE: ++ case CLOCK_MONOTONIC_COARSE: + retval = realtime_getres (res); + break; + +--- ./sysdeps/mach/clock_nanosleep.c.original 2020-07-21 00:31:35.226113142 +0200 ++++ ./sysdeps/mach/clock_nanosleep.c 2020-07-21 00:31:49.026185761 +0200 +@@ -62,7 +62,7 @@ + __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, + struct timespec *rem) + { +- if (clock_id != CLOCK_REALTIME ++ if ((clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_MONOTONIC_RAW && clock_id != CLOCK_REALTIME_COARSE && clock_id != CLOCK_MONOTONIC_COARSE) + || !valid_nanoseconds (req->tv_nsec) + || (flags != 0 && flags != TIMER_ABSTIME)) + return EINVAL; +Index: glibc-2.32/hurd/hurdlock.c +=================================================================== +--- glibc-2.32.orig/hurd/hurdlock.c ++++ glibc-2.32/hurd/hurdlock.c +@@ -47,7 +47,7 @@ int + __lll_abstimed_wait (void *ptr, int val, + const struct timespec *tsp, int flags, int clk) + { +- if (clk != CLOCK_REALTIME) ++ if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC) + return EINVAL; + + int mlsec = compute_reltime (tsp, clk); +@@ -59,7 +59,7 @@ int + __lll_abstimed_wait_intr (void *ptr, int val, + const struct timespec *tsp, int flags, int clk) + { +- if (clk != CLOCK_REALTIME) ++ if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC) + return EINVAL; + + int mlsec = compute_reltime (tsp, clk); +@@ -79,7 +79,7 @@ int + __lll_abstimed_xwait (void *ptr, int lo, int hi, + const struct timespec *tsp, int flags, int clk) + { +- if (clk != CLOCK_REALTIME) ++ if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC) + return EINVAL; + + int mlsec = compute_reltime (tsp, clk); +@@ -91,7 +91,7 @@ int + __lll_abstimed_lock (void *ptr, + const struct timespec *tsp, int flags, int clk) + { +- if (clk != CLOCK_REALTIME) ++ if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC) + return EINVAL; + + if (__lll_trylock (ptr) == 0) +@@ -177,7 +177,7 @@ __lll_robust_abstimed_lock (void *ptr, + int wait_time = 25; + unsigned int val; + +- if (clk != CLOCK_REALTIME) ++ if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC) + return EINVAL; + + while (1) diff --git a/gnu/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch b/gnu/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch new file mode 100644 index 0000000000..c4e9fd5105 --- /dev/null +++ b/gnu/packages/patches/glibc-2.35-hurd-clock_t_centiseconds.patch @@ -0,0 +1,63 @@ +Upstream status: taken from upstream: + + https://salsa.debian.org/glibc-team/glibc/-/blob/sid/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff + +Some applications assume centisecond precision, or at most millisecond precision +(e.g. guile). This is a work-around for them. + +--- + getclktck.c | 5 ++--- + setitimer.c | 2 +- + times.c | 2 +- + 4 files changed, 8 insertions(+), 9 deletions(-) +commit d57f2f9b4bd007846af2fb4217486ea572579010 +Author: Richard Braun +Date: Tue Aug 27 11:35:31 2013 +0200 + + Express CPU time (clock_t of times(2)) in centiseconds + +diff --git a/sysdeps/mach/hurd/getclktck.c b/sysdeps/mach/hurd/getclktck.c +index 69be2cc..5f7d946 100644 +--- a/sysdeps/mach/hurd/getclktck.c ++++ b/sysdeps/mach/hurd/getclktck.c +@@ -18,12 +18,11 @@ + + #include + +-/* Return frequency of `times'. +- Since Mach reports CPU times in microseconds, we always use 1 million. */ ++/* Return frequency of `times'. */ + int + __getclktck (void) + { +- return 1000000; ++ return 100; + } + + /* Before glibc 2.2, the Hurd actually did this differently, so we +diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c +index 39b6b16..4992c89 100644 +--- a/sysdeps/mach/hurd/setitimer.c ++++ b/sysdeps/mach/hurd/setitimer.c +@@ -42,7 +42,7 @@ quantize_timeval (struct timeval *tv) + static time_t quantum = -1; + + if (quantum == -1) +- quantum = 1000000 / __getclktck (); ++ quantum = 100 / __getclktck (); + + tv->tv_usec = ((tv->tv_usec + (quantum - 1)) / quantum) * quantum; + if (tv->tv_usec >= 1000000) +diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c +index 9e13a75..593c33a 100644 +--- a/sysdeps/mach/hurd/times.c ++++ b/sysdeps/mach/hurd/times.c +@@ -29,7 +29,7 @@ + static inline clock_t + clock_from_time_value (const time_value_t *t) + { +- return t->seconds * 1000000 + t->microseconds; ++ return t->seconds * 100 + t->microseconds / 10000; + } + + /* Store the CPU time used by this process and all its -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 5/8] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:03 +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.168440277416456 (code B ref 63527); Thu, 18 May 2023 09:40:03 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:34 +0000 Received: from localhost ([127.0.0.1]:52076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6f-0004HG-W2 for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6Z-0004Fy-R3 for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:28 -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 1pza6U-0006MW-KE; Thu, 18 May 2023 05:39:22 -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=j3V/fbemwUhVUgTMAoECVJXtUrqoUyzUYYP/EDAI6y8=; b=lMNVnUUeQgE8MUEJPVKx 5msfzSgplqg8rkRU3l0oDwgtzWv4L9cvmNbN7+WYZqA0yz1IMugicwkzCoD9aOLGwb6YsaGILiVbh JH1n1ORZdonnAJch3U0zsTNOVOYIEwIqprj7iVP7R6uY+r65xWT878q2zxhDoMM3e8egoVpqsQ4Fa ulbhuw5q6TTOZpaXa3r7YWNoutqObuHpYUgnzbt32M/BQ6lRmNRF3mrkhg77kJQa158L6jwP7MMb+ +oEuDWS6B2tFD2Cvn6MHoEoLudpYqXIMg8g7PbjjGxIs98HVHSIzuV28iSr3wUHiLm0wG/MslevcH dTVWid53Y1KNzQ==; Received: from [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 1pza6U-0006zE-7V; Thu, 18 May 2023 05:39:22 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:39:00 +0200 Message-Id: <8a33ba6a7672c2deb7e553bd9f95c8b22e3f4a58.1684402361.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd)[inputs]: Add rumpkernel. [arguments]: Rename `prepare-dde' phase to 'prepare-addons'. Add "rumpdisk" directory. Add --enable-static-progs=... option to #:configure-flags. --- gnu/packages/hurd.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index c7ea86b266..aaa9863a10 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -356,7 +356,7 @@ (define-public hurd (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-dde + (add-after 'unpack 'prepare-addons (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) @@ -370,7 +370,10 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit")))) + "libbpf libmachdevdde libddekit rumpdisk")) + (substitute* "rumpdisk/Makefile" + (("rumpdev_ahcisata" all) + (string-append all " rumpdev_ata"))))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -533,6 +536,7 @@ (define-public hurd #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi" "--disable-ncursesw" "--without-libbz2" "--without-libz" @@ -541,7 +545,11 @@ (define-public hurd ;; clnt_create "ac_func_search_save_LIBS=-ltirpc" "ac_cv_search_clnt_create=false" - "CFLAGS=-fcommon"))) + "CFLAGS=-fcommon") + #:make-flags + (list (string-append "RUMPPATH=" + (assoc-ref %build-inputs "rumpkernel") + "/lib")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) ;for /hurd/random @@ -557,7 +565,8 @@ (define-public hurd ("coreutils" ,coreutils) ("sed" ,sed) ("grep" ,grep) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux) + ("rumpkernel" ,rumpkernel))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 6/8] hurd-boot: Setup pci-arbiter and rumpdisk translators. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:04 +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.168440277516463 (code B ref 63527); Thu, 18 May 2023 09:40:04 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:35 +0000 Received: from localhost ([127.0.0.1]:52078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6g-0004HN-CT for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6a-0004Fz-D3 for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:28 -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 1pza6V-0006Mc-6i; Thu, 18 May 2023 05:39:23 -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=zl/bUEIf0LqRdL7LWKulZB6Pk4FbZtCp59YHQEM4g3A=; b=L8/kI9Y2gI4LeZ5G8Run tXEuMDtHqees+HNCGNRTgaXP1qEsuMDHs/2UXsCaXgwFdInrrWsqF7b7Cu2cHqoq+shPzCvLbOYhj 1QxK2F05fuZUD5o/ickeTgXokJs2iETUCPK37R8E2nebHpXtPc/5leNJjLKpAuTHMCjEby7bwUju8 DEk/+AqjpSwmf/HgnVSSWP2QzUujvu6orcUlsFtFBP1KlJEiJTrqJM0EkBfRARfW0YEWfvq0Lf/U+ S96n3Sqir8nybyqGMbb0EcqQqX7rda5tAqgblNe/xvU/ZjmldTsV+ZDT7hysDyG6F8qDB+5PSsUmO klL1iVT8Fe3O5A==; Received: from [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 1pza6U-0006zE-QL; Thu, 18 May 2023 05:39:23 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:39:01 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Setup pci-arbiter and rumpdisk translators. --- gnu/build/hurd-boot.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 95c15907dd..25c8f0ea51 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020-2022 Ludovic Courtès -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,7 +105,7 @@ (define* (make-hurd-device-nodes #:optional (root "/")) ;; TODO: Set the 'gnu.translator' extended attribute for passive translator ;; settings? - ) + (mkdir-p (scope "servers/bus/pci"))) (define (passive-translator-xattr? file-name) "Return true if FILE-NAME has an extended @code{gnu.translator} attribute @@ -183,7 +183,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) (mkdir-p dir)))) (define servers - '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + '(("servers/bus/pci" ("/hurd/pci-arbiter")) + ("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) ("servers/crash-kill" ("/hurd/crash" "--kill")) ("servers/crash-suspend" ("/hurd/crash" "--suspend")) ("servers/password" ("/hurd/password")) @@ -213,6 +214,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) ;; 'fd_to_filename' in libc expects it. ("dev/fd" ("/hurd/magic" "--directory" "fd") #o555) + ("dev/rumpdisk"("/hurd/rumpdisk") #o660) + ;; Create a number of ttys; syslogd writes to tty12 by default. ;; FIXME: Creating /dev/tty12 leads the console client to switch to ;; tty12 when syslogd starts, which is confusing for users. Thus, do @@ -249,6 +252,7 @@ (define* (set-hurd-device-translators #:optional (root "/")) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) (false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash"))) + (false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk"))) ;; Make sure /etc/mtab is a symlink to /proc/mounts. (false-if-exception (delete-file (scope "etc/mtab"))) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 4/8] gnu: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:04 +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.168440277516471 (code B ref 63527); Thu, 18 May 2023 09:40:04 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:35 +0000 Received: from localhost ([127.0.0.1]:52080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6g-0004HU-RG for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6Z-0004Fw-7z for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:29 -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 1pza6U-0006MO-0z; Thu, 18 May 2023 05:39:22 -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=rDUwo9jyM14qcCRHiJja2XQuusOMr2fbjILphkyXf9w=; b=IleMjeivnKL+PDirvkS2 0ouUwqNrRGWSBI0pSOgwzoaG1UgbfkkKIpMBQYdxEpAxBRo/nwXm9JN2u3+hHXevxKlUHOe+JLkbW JMrPMc/nO9lf07mXsvP+AV9jYQHlppQUL1HZkrRwkljZrnRg9fKWenOZ22+9tsqzHWGp1Qkd01QXu 5IEIi7b0V5Rf1BN9NnlQjsECt6vlDHNEMmdfl27M34eJoldNuATY+2qj/MYIyku2S3ass+AlEIiVH z4Gu/bp6OmRXAL4mIn4WcNNQUuHfDycee6CNPyzwbo5SDzEkDnhzj3S75SXxV1a1StYkFNHUg2Rtw SCbthdRI2zsMWA==; Received: from [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 1pza6T-0006zE-Kn; Thu, 18 May 2023 05:39:21 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:38:59 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This uses the Debian Salsa rumpkernel package git as upstream as that is where delopment happens. Once things have stabalized upstream may change to the NetBSD git from where Debian takes their snapshots. * gnu/packages/hurd.scm (rumpkernel): New variable. --- gnu/packages/hurd.scm | 206 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index da94b05272..c7ea86b266 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -662,3 +662,209 @@ (define-public netdde ;; Some drivers are dually licensed with the options being GPLv2 or one ;; of MPL/Expat/BSD-3 (dependent on the driver). (license gpl2)))) + +(define-public rumpkernel + (let ((commit "ec2ab9612be4dc48a316a21a0c96d3388478a064") + (revision "2")) + (package + (name "rumpkernel") + (version (git-version "0-20211031" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/hurd-team/rumpkernel.git") + (commit commit))) + (sha256 + (base32 + "1ypjg3jyzhh3gnanmk6fh76dwl5ml78n311nbi0hw7f7hygzn7vk")) + (file-name (git-file-name name commit)))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:modules '((srfi srfi-26) + (ice-9 match) + (ice-9 rdelim) + (guix build utils) + (guix build gnu-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patches + (lambda* (#:key target #:allow-other-keys) + (let* ((patch-directory "debian/patches/") + (series (string-append patch-directory "series")) + (text (with-input-from-file series read-string)) + (lines (string-split (string-trim-right text) #\newline)) + (patches (filter (negate (cute string-prefix? "#" <>)) + lines)) + (patch-files (map + (cute string-append patch-directory <>) + patches))) + (for-each + (cute invoke "patch" "--force" "-p1" "-i" <>) + patch-files) + ;; Somewhere in the build.sh/make process MIG is not being + ;; exported, apparently. + (when target + (substitute* "pci-userspace/src-gnu/Makefile.inc" + (("MIG=mig") + (string-append "MIG=" target "-mig"))))))) + (add-before 'configure 'setenv + (lambda* (#:key build target #:allow-other-keys) + (define (noisy-setenv name value) + (setenv name value) + (format (current-error-port) "set ~a=~s\n" name value)) + (noisy-setenv "HOST_CC" "gcc") + (when target + (noisy-setenv "MIG" (string-append target "-mig"))) + (let ((target (or target build))) + (noisy-setenv "TARGET_AR" (string-append target "-ar")) + (noisy-setenv "TARGET_CC" (string-append target "-gcc")) + (noisy-setenv "TARGET_CXX" (string-append target "-g++")) + (noisy-setenv "TARGET_LD" (string-append target "-ld")) + (noisy-setenv "TARGET_MIG" (string-append target "-mig")) + (noisy-setenv "TARGET_NM" (string-append target "-nm"))) + (setenv "PAWD" "pwd") + (for-each + (cute noisy-setenv <> "") + '("_GCC_CRTENDS" + "_GCC_CRTEND" + "_GCC_CRTBEGINS" + "_GCC_CRTBEGIN" + "_GCC_CRTI" + "_GCC_CRTN")) + (noisy-setenv "BSDOBJDIR=" (string-append (getcwd) "/obj")))) + (replace 'configure + (lambda args + (let ((configure (assoc-ref %standard-phases 'configure))) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (apply configure args))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (let* ((jobs (if parallel-build? (parallel-job-count) 1)) + (host-cpu (match #$(or (%current-target-system + (%current-system))) + ("i586-pc-gnu" "i386") + ("i686-linux" "i386") + ("x86_64-linux" "amd64"))) + (toprump (string-append + (getcwd) + "/buildrump.sh/src/sys/rump")) + (rump-make (string-append + (getcwd) + "/buildrump.sh/src/obj/tooldir/bin/nbmake-" + host-cpu))) + (mkdir "obj") + (with-directory-excursion "buildrump.sh/src" + (invoke + "sh" "build.sh" + "-V" "TOOLS_BUILDRUMP=yes" + "-V" "MKBINUTILS=no" + "-V" "MKGDB=no" + "-V" "MKGROFF=no" + "-V" (string-append "TOPRUMP=" toprump) + "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" + "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" + "-V" (string-append + "CPPFLAGS=" + " -I../../obj/destdir." host-cpu "/usr/include" + " -D_FILE_OFFSET_BITS=64" + " -DRUMP_REGISTER_T=int" + " -DRUMPUSER_CONFIG=yes" + " -DNO_PCI_MSI_MSIX=yes" + " -DNUSB_DMA=1") + "-V" (string-append + "CWARNFLAGS=" + " -Wno-error=maybe-uninitialized" + " -Wno-error=address-of-packed-member" + " -Wno-error=unused-variable" + " -Wno-error=stack-protector" + " -Wno-error=array-parameter" + " -Wno-error=array-bounds" + " -Wno-error=stringop-overflow") + "-V" "LIBCRTBEGIN=" + "-V" "LIBCRTEND=" + "-V" "LIBCRT0=" + "-V" "LIBCRTI=" + "-V" "_GCC_CRTENDS=" + "-V" "_GCC_CRTEND=" + "-V" "_GCC_CRTBEGINS=" + "-V" "_GCC_CRTBEGIN=" + "-V" "_GCC_CRTI=" + "-V" "_GCC_CRTN=" + "-U" + "-u" + "-T" "./obj/tooldir" + "-m" host-cpu + "-j" (number->string jobs) + "tools" + "rump")) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (setenv "RUMPRUN" "true") + (invoke rump-make "dependall")) + (with-directory-excursion "pci-userspace/src-gnu" + (invoke rump-make "dependall"))))) + (replace 'install + (lambda _ + (define (install-file file target) + (let ((dest (string-append target (basename file)))) + (format (current-output-port) "`~a' -> `~a'~%" file dest) + (mkdir-p (dirname dest)) + (if (file-exists? dest) + (format (current-error-port) + "warning: skipping: ~a\n" file) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest))))))) + (let ((header (string-append #$output "/include/rump")) + (lib (string-append #$output "/lib/"))) + (mkdir-p header) + (copy-recursively "buildrump.sh/src/sys/rump/include/rump" + header) + (mkdir-p lib) + (for-each + (cute install-file <> lib) + (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") + (find-files "obj" "librump.*[.](a|so.*)"))))))))) + (inputs + (list gnumach-headers libpciaccess-0.17)) + (native-inputs + (list + autoconf + automake + libgcrypt + (if (%current-target-system) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig) + zlib)) + (supported-systems %hurd-systems) + (home-page "https://wiki.netbsd.org/rumpkernel") + (synopsis "NetBSD as rumpkernel for the GNU/Hurd") + (description + "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that +the Hurd may be installed on iron. Using this rumpkernel package, the hurd +package's rumpdisk can be built which provides the pci.arbiter and rumpdisk +servers.") + (license (list + asl2.0 + boost1.0 + bsd-2 + bsd-3 + bsd-4 + cddl1.0 + expat + gpl1 + gpl2+ + gpl3+ + isc + lgpl2.0+ + public-domain + (@ (guix licenses) zlib) + (non-copyleft "file://src/lib/libc/hash/hashhl.c" + "See debian/copyright in the distribution.")))))) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 8/8] system: hurd: Boot with pci.arbiter and rumpdisk. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:05 +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.168440277616477 (code B ref 63527); Thu, 18 May 2023 09:40:05 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:36 +0000 Received: from localhost ([127.0.0.1]:52082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6h-0004Hc-IK for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6b-0004G2-Hp for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:30 -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 1pza6W-0006Mq-BL; Thu, 18 May 2023 05:39:24 -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=sSJfa0BztPSqifWm50KJnKP5djVPoVLoa+DKArt/AhY=; b=TzvlciHmpUwXeF580Y0h ChWE16G1tUWsls8qF/PoSrzwC8vWDAY+jBF9dzvQOVk4oMMLuGMWnHbkc+BKbGvhweM7z2zjM8Fb2 oqBNmQAyClYx/GgBYK5B+BTtPUlr4yYC0NK9b4Nx02j/egVEI63uVqrfFZdEsGSmVPALXplKQFrXg 1C6wt29coQEoX98AcTbPuFUmlFZSVsdrU+jiaPKog1bcZ3PbWL0F8IkCUTX7hMxTEfTzgrib1hANQ x8nbqw07RooU2VVmNdvy40fkuzYxMIFeOmBttz82a95DsvqQXSLRCuzGOMoFBgCifjN1nna/If+9G HxsSFBzOvV9/vQ==; Received: from [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 1pza6V-0006zE-VC; Thu, 18 May 2023 05:39:24 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:39:03 +0200 Message-Id: <91b78533b3abd24c04f3f09463bc061f56cf4805.1684402361.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Be sure to give the Hurd enough (virtual) memory * gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and rumpdisk. --- gnu/system.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..23addf41e9 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2022 Maxim Cournoyer -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework @@ -1486,16 +1486,28 @@ (define (operating-system-multiboot-modules os) (define (hurd-multiboot-modules os) (let* ((hurd (operating-system-hurd os)) + (pci-arbiter-command + (list (file-append hurd "/hurd/pci-arbiter.static") + "pci-arbiter" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--next-task='${disk-task}'" + "'$(pci-task=task-create)'" + "'$(task-resume)'")) + (rumpdisk-command + (list (file-append hurd "/hurd/rumpdisk.static") + "rumpdisk" + "--next-task='${fs-task}'" + "'$(disk-task=task-create)'")) (root-file-system-command (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" "--multiboot-command-line='${kernel-command-line}'" - "--host-priv-port='${host-port}'" - "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" "--x-xattr-translator-records" - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + "'${root}'" + "'$(fs-task=task-create)'")) (target (%current-target-system)) (libc (if target (with-parameters ((%current-target-system #f)) @@ -1512,7 +1524,10 @@ (define (hurd-multiboot-modules os) ;; (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'") (list (file-append hurd "/hurd/exec.static") "exec" "'$(exec-task=task-create)'"))) - (list root-file-system-command exec-server-command))) + (list pci-arbiter-command + rumpdisk-command + root-file-system-command + exec-server-command))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 7/8] services: childhurd: Bump default qemu memory to 2048MB. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:05 +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.168440278716517 (code B ref 63527); Thu, 18 May 2023 09:40:05 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:47 +0000 Received: from localhost ([127.0.0.1]:52084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6t-0004IK-4U for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6a-0004G1-W6 for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:37 -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 1pza6V-0006Mk-PB; Thu, 18 May 2023 05:39:23 -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=7ca3+qD7m2ueBebjxXDwIfUQ+t49Fn+m1ezMNqZa+8Q=; b=GzPJD8eZsi+Thh0u3Tqc uacM0S3OEF49n0QJ294La0N7OlASn7jb3tlI7kQ1vzJ01WNgPPjg6KA9evIZ10FrwBNz33QFPOYd+ z7edsSZWFqnDxnfFgvOPUuAxd6FtBYegGzxQbDH8EUxHRN8W6PXkQNvT99CdVb3m3OPNd7uzXkwYU 8quNRbZCIgigcqoVgrXCXzeKsPg+2Q6yA/98yFBBGyqFIOXmqyfiWtZNQY5ACuTBSetR9Fg4ZC42H HtWk2AWzISn7qNwunVlAyuo81RwOmFz/gDCUDz+72nc7OM/npQh7CALFQrJef2XhyO2p/CipCl9PT xXSPkuOXz+YiXA==; Received: from [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 1pza6V-0006zE-Cc; Thu, 18 May 2023 05:39:23 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:39:02 +0200 Message-Id: <11e63f303ba42376ebc029c67f13b59bdb0af263.1684402361.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) When booting with pci-arbiter and rumpdisk and using 1024MB of memory for qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot messages. At least 1200MB is required, currently. * gnu/services/virtualization.scm ()[memory-size]: Bump to 2048. * gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too. Update example `guix system image' and "qemu" command lines too. --- gnu/services/virtualization.scm | 4 ++-- gnu/system/examples/bare-hurd.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 2e311e3813..886b73f8c7 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ryan Moe ;;; Copyright © 2018, 2020-2022 Ludovic Courtès -;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2021, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Timotej Lazar ;;; Copyright © 2022 Oleg Pykhalov ;;; Copyright © 2022 Leo Nikkilä @@ -1100,7 +1100,7 @@ (define-record-type* (disk-size hurd-vm-configuration-disk-size ;number or 'guess (default 'guess)) (memory-size hurd-vm-configuration-memory-size ;number - (default 512)) + (default 2048)) (options hurd-vm-configuration-options ;list of string (default `("--snapshot"))) (id hurd-vm-configuration-id ;#f or integer [1..] diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index f0dd0cf742..463c7ee798 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -5,12 +5,12 @@ ;; To build a disk image for a virtual machine, do ;; -;; ./pre-inst-env guix system image --target=i586-pc-gnu \ +;; ./pre-inst-env guix system image --image-type=hurd-raw \ ;; gnu/system/examples/bare-hurd.tmpl ;; ;; You may run it like so ;; -;; guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \ +;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \ ;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ ;; -snapshot -hda ;; -- 2.39.2 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 17:12:01 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16844298672319 (code B ref 63527); Thu, 18 May 2023 17:12:01 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 17:11:07 +0000 Received: from localhost ([127.0.0.1]:54313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzh9f-0000bL-95 for submit@debbugs.gnu.org; Thu, 18 May 2023 13:11:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzh9a-0000am-BN for 63527@debbugs.gnu.org; Thu, 18 May 2023 13:11:05 -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 1pzh9U-0008KZ-5a; Thu, 18 May 2023 13:10:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=j2jyXmCIquNYjC5sK/8rPtH/xDJkR7wdU7jLm4rT3u8=; b=mg/yu7CnQ5rIDvzE0X8d isgEkR4WUrZjfP+aqfX8lkPVL54c1KIDGymwG4LnP3R0AkO44mbtx2C1L4C7/R75yAi5IrJBfcnTh QvUFoO0cI6Bl1jFuUKAjkyp/XCGqSnwETDDhjKPsGs6PRipT45jexddDq4jCUx2yZxWeB+EmopEoA V0u+Di9sxl9QLBn/KBvHLHkKBP6DH7pc2wJ/+CqMsQDEhX0Av3n66B2KLZyKnPxevhQCkfNPQsDJ8 SWCGc2/C89bwrFSMfPfy50NmyuzBDwuYZWwWOX0EvxB718zlJ+dLvRxn3jol6M9fWkeuOrX0m9elu 1TfEoIkQitfkyA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzh9T-0000Ol-OY; Thu, 18 May 2023 13:10:55 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <23790bf9a3383c0adf74ec209eb9222c410f667b.1684402361.git.janneke@gnu.org> Date: Thu, 18 May 2023 19:10:53 +0200 In-Reply-To: <23790bf9a3383c0adf74ec209eb9222c410f667b.1684402361.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Thu, 18 May 2023 11:38:56 +0200") Message-ID: <87353t4lb6.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Awesome patch series!! Janneke Nieuwenhuizen skribis: > +++ b/gnu/packages/cross-base.scm > @@ -1,7 +1,7 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2013-2018, 2020, 2023 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2014, 2015, 2018 Mark H Weaver > -;;; Copyright =C2=A9 2016, 2019 Jan (janneke) Nieuwenhuizen > +;;; Copyright =C2=A9 2016, 2019, 2023 Janneke Nieuwenhuizen > ;;; Copyright =C2=A9 2016 Manolis Fragkiskos Ragkousis > ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2019, 2020, 2021 Marius Bakke > @@ -624,7 +624,22 @@ (define* (cross-libc* target > (("/[^ ]+/lib/libc.so.0.3") > (string-append out "/lib/libc.so.0.3" > " libmachuser.so libhurdu= ser.so")))) > - #t))) > + #t)) > + ;; TODO: move to glibc in the next rebuild cycle > + (add-after 'unpack 'patch-libc/hurd > + (lambda* (#:key inputs #:allow-other-keys) > + (for-each > + (lambda (name) > + (let ((patch (assoc-ref inputs name))) > + (invoke "patch" "-p1" "--force" "-R" "-i= " patch))) > + '("hurd-monotonic.patch" > + "hurd-centiseconds.patch")) Since this should also be applied when building glibc natively on i586-gnu, should this phase go to =E2=80=98glibc=E2=80=99 in (gnu packages = base) instead? Also, in general, we should move away from quasiquote/unquote to gexp/ungexp, which will allow us to not add inputs for patches (as is done with =E2=80=98gcc-11=E2=80=99 in (gnu packages gcc)). > + ;; TODO: move to glibc in the next rebu= ild cycle > + ("hurd-monotonic.patch" > + ,@(search-patches > + "glibc-hurd-clock_gettime_monotonic= .patch")) > + ("hurd-centiseconds.patch" > + ,@(search-patches > + "glibc-hurd-clock_t_centiseconds.pa= tch")) > + ("2.35-hurd-monotonic.patch" > + ,@(search-patches > + "glibc-2.35-hurd-clock_gettime_mono= tonic.patch")) > + ("2.35-hurd-centiseconds.patch" > + ,@(search-patches > + "glibc-2.35-hurd-clock_t_centisecon= ds.patch"))) Let=E2=80=99s hope these patches will soon make it upstream! Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 17:18:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16844302432977 (code B ref 63527); Thu, 18 May 2023 17:18:02 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 17:17:23 +0000 Received: from localhost ([127.0.0.1]:54325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzhFi-0000lw-Qs for submit@debbugs.gnu.org; Thu, 18 May 2023 13:17:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzhFg-0000lj-Bb for 63527@debbugs.gnu.org; Thu, 18 May 2023 13:17:20 -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 1pzhFa-0001qI-13; Thu, 18 May 2023 13:17:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=FRr1dhZoldnz7NX0IXabAIHDQWtEiM03Ppltrx0Rf7U=; b=h5a6AlX71tdlICryi2OX DpU84PGlgdKmZrBwjcHiVxuRNlvsVqx++wf7+qSubvjBx/xSZYiDvtgBIGwNYJIeS/MBeVRbTZYEv mJM+NkkW0Cetx69eUHixHOU59yMLL96yygS9ERTiEgRZmJ4eh7sscKPAd1T221s7nOtka0MGMTDyE EvPgL7cpuX1ar3C4ln7cUmuJuPl8nlo3BU5a2LHxMtI4WAWv4HYJQzkIbi+vZgCR1qnjlcz23+5H0 B/FckV6o9NYD3/cU80aDceZfjubuxbV8CQAuImXBj9GSX1Fa+88IdgPSE5V95TN5DHffHWkJ5A2Yl 9W5kYARNg3MnbA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhFZ-00010Y-KM; Thu, 18 May 2023 13:17:13 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Thu, 18 May 2023 19:17:11 +0200 In-Reply-To: (Janneke Nieuwenhuizen's message of "Thu, 18 May 2023 11:38:59 +0200") Message-ID: <87wn1536g8.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > This uses the Debian Salsa rumpkernel package git as upstream as that is = where > delopment happens. Once things have stabalized upstream may change to the > NetBSD git from where Debian takes their snapshots. Could you make it a comment close to the =E2=80=98origin=E2=80=99 form? > * gnu/packages/hurd.scm (rumpkernel): New variable. [=E2=80=A6] > + #~(modify-phases %standard-phases You can tell from the phases that it took of lot of sweat to get there. :-) Could you add a few comments while it=E2=80=99s fresh on your mind to expla= in the various tweaks? The =E2=80=98build=E2=80=99 phase is particularly inti= midating. > + (native-inputs > + (list > + autoconf > + automake > + libgcrypt > + (if (%current-target-system) > + (let* ((cross-base (resolve-interface '(gnu packages cross-b= ase))) > + (cross-mig (module-ref cross-base 'cross-mig))) > + (cross-mig (%current-target-system))) > + mig) I think you could #:use-module (gnu packages cross-base) and refer to =E2=80=98cross-mig=E2=80=99 directly. Also, watch out the indentation. ;-) (native-inputs (list autoconf automake =E2=80=A6)) > + (license (list > + asl2.0 > + boost1.0 Could you add a comment above briefly stating what this list means? (I suppose each license applies to a specific part of the source?) Anyhow, well done! Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 17:20:01 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16844303453151 (code B ref 63527); Thu, 18 May 2023 17:20:01 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 17:19:05 +0000 Received: from localhost ([127.0.0.1]:54330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzhHN-0000ok-8z for submit@debbugs.gnu.org; Thu, 18 May 2023 13:19:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzhHL-0000oH-FN for 63527@debbugs.gnu.org; Thu, 18 May 2023 13:19:03 -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 1pzhHE-00027V-IM; Thu, 18 May 2023 13:18:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=w1sPtqQBYFKxfbHlDF+D/fT3XWdmZWuG0ETnwqRk3Jk=; b=JQpy0bueO67/uCmBc50U pvjQJ8e40E6bPdk+n4qwpHasZf9Nqtrpi9qjJ2CPhwUOZP8K3ekOwJk/O+cQX389CvpHyvmRAoKaU KjxQ06ipJ3Z3rA9UgCTLuYrQh9edGAN+GFT10jsEw3GpNsWWWZNPIGbgyjtAs/orRfG2kLyIZYdKS SO/0iYJjB1S+SP1Adj6FXTX9AHimVYowqQ48F4H0y6vdInQTJCFEyLeF1tYFJ5paWYco9tmOpiT7c 3GuzNenCKkHm+843ixyK8jzkMtQ+kIQqypWfsr72k71AYaJyKEdwJz6Vjlm5I0TLKCJizO4G8ztmW 0rV+6h/d0bQizQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhHD-0007XX-Vj; Thu, 18 May 2023 13:18:56 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <91b78533b3abd24c04f3f09463bc061f56cf4805.1684402361.git.janneke@gnu.org> Date: Thu, 18 May 2023 19:18:54 +0200 In-Reply-To: <91b78533b3abd24c04f3f09463bc061f56cf4805.1684402361.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Thu, 18 May 2023 11:39:03 +0200") Message-ID: <87sfbt36dd.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > (define (hurd-multiboot-modules os) > (let* ((hurd (operating-system-hurd os)) > + (pci-arbiter-command > + (list (file-append hurd "/hurd/pci-arbiter.static") > + "pci-arbiter" > + "--host-priv-port='${host-port}'" > + "--device-master-port='${device-port}'" > + "--next-task='${disk-task}'" > + "'$(pci-task=task-create)'" > + "'$(task-resume)'")) > + (rumpdisk-command > + (list (file-append hurd "/hurd/rumpdisk.static") > + "rumpdisk" > + "--next-task='${fs-task}'" > + "'$(disk-task=task-create)'")) > (root-file-system-command > (list (file-append hurd "/hurd/ext2fs.static") > "ext2fs" > "--multiboot-command-line='${kernel-command-line}'" > - "--host-priv-port='${host-port}'" > - "--device-master-port='${device-port}'" > "--exec-server-task='${exec-task}'" > "--store-type=typed" > "--x-xattr-translator-records" > - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) > + "'${root}'" > + "'$(fs-task=task-create)'")) > (target (%current-target-system)) Wo0t, impressive! From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 17:21:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16844304233282 (code B ref 63527); Thu, 18 May 2023 17:21:02 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 17:20:23 +0000 Received: from localhost ([127.0.0.1]:54335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzhIc-0000qs-Md for submit@debbugs.gnu.org; Thu, 18 May 2023 13:20:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzhIb-0000qe-LG for 63527@debbugs.gnu.org; Thu, 18 May 2023 13:20:21 -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 1pzhIW-0002UJ-B9; Thu, 18 May 2023 13:20:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=CbjlS3L5vxedrtbxrjwN0Nj+STzXRcHAhpaq1MvMJRQ=; b=lth0EnlPI7VCpE5fmaNS hwHKdM4S6gSBtXdZEkPLswvvKNN0i4qA5c2V5bLG+/PBEV2cqhi0Z/TAqRCB+Im8J6duXq+fbJMql CFg/A/ukkN+j8+oRq6LLGKqddcR5u7UbED4VWBKdmoVTHLRr/rrIlS4z+eJh3OiTSGbWqN4jWCp8j o1FGiS8zGwYxFEaU4WMTX4pGd64dwMx6+cGa+iQ85AuXdLlNHvRkhH6AN56SDIR7QfvgWK5dtfQUI ju3jUoHLmmhlzgnpV3CQF2VVqy2/E6cDuJm9P8S+2y1eqymsIKXNcR4e8EXlxG8GJTj0MtUsMQX4/ kK6+IG/xCQhZsw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhIV-0007cu-Ua; Thu, 18 May 2023 13:20:16 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <11e63f303ba42376ebc029c67f13b59bdb0af263.1684402361.git.janneke@gnu.org> Date: Thu, 18 May 2023 19:20:14 +0200 In-Reply-To: <11e63f303ba42376ebc029c67f13b59bdb0af263.1684402361.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Thu, 18 May 2023 11:39:02 +0200") Message-ID: <87o7mh36b5.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > When booting with pci-arbiter and rumpdisk and using 1024MB of memory for > qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot > messages. At least 1200MB is required, currently. > > * gnu/services/virtualization.scm ()[memory-size]:= Bump > to 2048. > * gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too. Update > example `guix system image' and "qemu" command lines too. Sounds a bit fishy. :-) Does Debian resort to a similar workaround? Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 08:22:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org, dev@jpoiret.xyz Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168448451123620 (code B ref 63527); Fri, 19 May 2023 08:22:02 +0000 Received: (at 63527) by debbugs.gnu.org; 19 May 2023 08:21:51 +0000 Received: from localhost ([127.0.0.1]:55378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzvN0-00068u-G1 for submit@debbugs.gnu.org; Fri, 19 May 2023 04:21:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzvMx-00068c-BB for 63527@debbugs.gnu.org; Fri, 19 May 2023 04:21:49 -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 1pzvMr-0002ry-20; Fri, 19 May 2023 04:21:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=xIEuJnAGVAKmcq2L5wyWzBTDAiZ8TMEyzZYnNmstmfc=; b=VER40cDSbKXIzYvOqsvP pAIyBJPBl7MJ+1bFXiFm8LSV7J0QR0Dr7bTdZxSLl1tDzntKN4+aRW+iKTRIxCIFZp1cK4OFbILgm oGdbGbvc4OKtYdAKKEmbItDn+2s6/bLZWr7FnxzWTt8xZGGX/xzR3YGMiOfZLEyLP8rFeuz4s3lgE q2Aid01NIb4omGuMBhV/+1XAEw+649KsH3I3piYQAFRwCnHLCMGJoJHRrf4gkmOculruLdQVGKSR7 HDNj/c8ixeZI8VcQZocBxX6gd++KRPGDlIGd/IwycRmEfL2jIyWYftXKox0BNToQEFNKYUPIV06RU LF8lNxB5tC5p7Q==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvMq-0000vW-LG; Fri, 19 May 2023 04:21:40 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <23790bf9a3383c0adf74ec209eb9222c410f667b.1684402361.git.janneke@gnu.org> <87353t4lb6.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 19 May 2023 10:21:36 +0200 In-Reply-To: <87353t4lb6.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Thu, 18 May 2023 19:10:53 +0200") Message-ID: <87ttw8g29b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: Hi! > Awesome patch series!! Thanks! > Janneke Nieuwenhuizen skribis: > >> +++ b/gnu/packages/cross-base.scm [..] >> + ;; TODO: move to glibc in the next rebuild cycle >> + (add-after 'unpack 'patch-libc/hurd >> + (lambda* (#:key inputs #:allow-other-keys) >> + (for-each >> + (lambda (name) >> + (let ((patch (assoc-ref inputs name))) >> + (invoke "patch" "-p1" "--force" "-R" "-= i" patch))) >> + '("hurd-monotonic.patch" >> + "hurd-centiseconds.patch")) > > Since this should also be applied when building glibc natively on > i586-gnu, should this phase go to =E2=80=98glibc=E2=80=99 in (gnu package= s base) > instead? Yes, but I don't know how to do that without triggering a world rebuild, or (re)creating a glibc/hurd, and currently the native build is broken on the hurd. It tried, in glibc #:phases (modify-phases %standard-phases ,@(if (and (hurd-target?) (equal? (package-version this-package) "2.35")) ;; TODO: move to glibc in the next rebuild cycle '((add-after 'unpack 'patch-libc/hurd (lambda* (#:key inputs #:allow-other-keys) (define* (apply-patch patch #:key reverse?) (let ((patch (assoc-ref inputs name))) (invoke "patch" "-p1" "--force" (if reverse? "-R" "-N") "-i" patch))) (for-each (cut apply-patch <> #:reverse #t) '("hurd-monotonic.patch" "hurd-centiseconds.patch")) (for-each apply-patch '("2.35-hurd-centiseconds.patch" "2.35-hurd-monotonic.patch"))))) '()) but that isn't being picked-up for cross-libc. I heard talk about glibc/hurd, should we maybe keep this patch until we create glibc/hurd, or make glibc/hurd sooner? > Also, in general, we should move away from quasiquote/unquote to > gexp/ungexp, which will allow us to not add inputs for patches (as is > done with =E2=80=98gcc-11=E2=80=99 in (gnu packages gcc)). Ah, right; nice! Would that work for cross-libc without triggering a world rebuild? >> + ;; TODO: move to glibc in the next reb= uild cycle >> + ("hurd-monotonic.patch" >> + ,@(search-patches >> + "glibc-hurd-clock_gettime_monotoni= c.patch")) [..] > Let=E2=80=99s hope these patches will soon make it upstream! Yeah! Greetings Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 09:22:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168448808730048 (code B ref 63527); Fri, 19 May 2023 09:22:01 +0000 Received: (at 63527) by debbugs.gnu.org; 19 May 2023 09:21:27 +0000 Received: from localhost ([127.0.0.1]:55443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzwIg-0007oa-Me for submit@debbugs.gnu.org; Fri, 19 May 2023 05:21:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzwIe-0007oL-3z for 63527@debbugs.gnu.org; Fri, 19 May 2023 05:21:26 -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 1pzwIX-00049u-Sf; Fri, 19 May 2023 05:21:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=81LjHlo76MO6afhBX0/ZS2pQrxbXcJqH81vJSDIWgCA=; b=kQeArzCf9w/gxDdx/Dwm +U7nCkcO1Y6USI8VtByFGI8JZ3ukauTbFbvZXALsGFEWBOn2AoqZNEr1AL/oeFn3+FObnckUqNOoC cwL4/Dbx1L0py9ik7R5/KjZ7Z3z2jclJWAGoJhnnuEtz51LABYFBGhpOf2xLr1wNJ7GswE2w4xgL7 HPxwa/PWXD3rydUK7F67vHhMnIDNx4AXwyth9XpQmTv1pLrspedDSeL+d0zrTu5fsiifZcdY/Ace3 6N1iF23t0/XayNqGKrJAO0kdQ6tf5LMiE98IzD1iDYSR9MBIPp+l/WxAQwO4nQauhWCk9yDtboh/N tW/GioYF90GWzw==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzwIM-0001vG-Am; Fri, 19 May 2023 05:21:17 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87wn1536g8.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 19 May 2023 11:21:01 +0200 In-Reply-To: <87wn1536g8.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Thu, 18 May 2023 19:17:11 +0200") Message-ID: <87fs7sfzia.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> This uses the Debian Salsa rumpkernel package git as upstream as that is= where >> delopment happens. Once things have stabalized upstream may change to t= he >> NetBSD git from where Debian takes their snapshots. > > Could you make it a comment close to the =E2=80=98origin=E2=80=99 form? That makes sense, so it doesn't get lost, done. >> * gnu/packages/hurd.scm (rumpkernel): New variable. > > [=E2=80=A6] > >> + #~(modify-phases %standard-phases > > You can tell from the phases that it took of lot of sweat to get there. > :-) > > Could you add a few comments while it=E2=80=99s fresh on your mind to exp= lain > the various tweaks? The =E2=80=98build=E2=80=99 phase is particularly in= timidating. I have added a general comment ;; As we are using the Debian package as upstream, we follow their ;; build: ;; * apply patches in debian/patches taken from the ;; debian/patches/series file ;; * for the configure, make, and install stages, follow ;; the code in debian/rules ;; The Debian patchset includes a cross build feature that we ;; use with two differences ;; * Debian uses a multiarch toolchain ;; * we use cross-mig #:phases #~(modify-phases %standard-phases a comment before 'build ;; The build has three toplevel entry points ;; * buildrump.sh/src/build.sh: create a NetBSD-compatible ;; toolchain and supports cross-compiling ;; * buildrump.sh/src/lib/librumpuser: the librump* libraries ;; * pci-userspace/src-gnu: the librumpdev_pci* libraries (replace 'build and a comment in install ;; Some libraries are duplicated/copied around in the ;; build system, do not fail trying to install one ;; a second time. (if (file-exists? dest) (format (current-error-port) "warning: skipping: ~a\n" file) >> + (native-inputs >> + (list >> + autoconf >> + automake >> + libgcrypt >> + (if (%current-target-system) >> + (let* ((cross-base (resolve-interface '(gnu packages cross-= base))) >> + (cross-mig (module-ref cross-base 'cross-mig))) >> + (cross-mig (%current-target-system))) >> + mig) > > I think you could #:use-module (gnu packages cross-base) and refer to > =E2=80=98cross-mig=E2=80=99 directly. Right. Weird, other packages do it like this and I copied without thinking. Possibly there was a circular dependency before? > Also, watch out the indentation. ;-) > > (native-inputs > (list autoconf > automake > =E2=80=A6)) Ah, changed. I need to remember this, I'm a sucker for M-x sort-lines. >> + (license (list >> + asl2.0 >> + boost1.0 > Could you add a comment above briefly stating what this list means? (I > suppose each license applies to a specific part of the source?) Changed to (license ;; The NetBSD rumpkernel code is a big hodgepodge of softwares many = of ;; which have their own different licensing terms, see also ;; https://salsa.debian.org/hurd-team/rumpkernel/-/blob/master/debia= n/copyright (list asl2.0 boost1.0 ... > Anyhow, well done! Yay! (A v5 patch series with this to follow once we have figured out the glibc/hurd patching problem.) Greetings, --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 09:31:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168448863630929 (code B ref 63527); Fri, 19 May 2023 09:31:02 +0000 Received: (at 63527) by debbugs.gnu.org; 19 May 2023 09:30:36 +0000 Received: from localhost ([127.0.0.1]:55454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzwRX-00082n-Nj for submit@debbugs.gnu.org; Fri, 19 May 2023 05:30:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzwRW-00082b-JL for 63527@debbugs.gnu.org; Fri, 19 May 2023 05:30:35 -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 1pzwRR-0005tf-Ci; Fri, 19 May 2023 05:30:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=RUTBlNLZvQvzycNHSV6/bHeGRTS8f2o2Eim/AQr6shc=; b=oJlAzPOBKSw1Q7k6ga04 ubTIbDC+L5JuFMeWusepVQp46Vg89AC+Az08fgLnkRF43/lNvr6CCwVp1xnSsqmNokfCTYjfLNsRh v4fW30XYvd5orRDS9aVFTWlRbgwf1WlYBSh7iOShildetutMxETzAQW9GGgS3kaCyrhHDtFJWrKAr xI8Nz4LTjfO7PqJATmuIgYXB+qxns+FjP9QU/eecK7O5FyhEoCwLMZtkxLmqTsXCTq2PBRXkMM4yQ WWHz8jG+6eMdvzxUi53iCa7SCCtFtesVTfZejGM7gP4Vm7bICXExYXHvl1xiGcZ2Hfw6eVdigtc70 4SpVhGrV02+oWQ==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzwRQ-0007ji-MQ; Fri, 19 May 2023 05:30:28 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <11e63f303ba42376ebc029c67f13b59bdb0af263.1684402361.git.janneke@gnu.org> <87o7mh36b5.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 19 May 2023 11:30:24 +0200 In-Reply-To: <87o7mh36b5.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Thu, 18 May 2023 19:20:14 +0200") Message-ID: <87a5y0fz2n.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> When booting with pci-arbiter and rumpdisk and using 1024MB of memory for >> qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot >> messages. At least 1200MB is required, currently. >> >> * gnu/services/virtualization.scm ()[memory-size]= : Bump >> to 2048. >> * gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too. Upda= te >> example `guix system image' and "qemu" command lines too. > > Sounds a bit fishy. :-) > > Does Debian resort to a similar workaround? Yes, Debian has the same problem, the latest debian image (https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd-2022= 0824.img) hangs in an identical way. See https://logs.guix.gnu.org/hurd/2023-05-18.log#091300 youpi seid "rumpdisk is very eaty, we need to fix that" Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 01/11] gnu: Add libpciaccess-0.17. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:02 +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.168485686430069 (code B ref 63527); Tue, 23 May 2023 15:48:02 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:47:44 +0000 Received: from localhost ([127.0.0.1]:40206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEh-0007on-TE for submit@debbugs.gnu.org; Tue, 23 May 2023 11:47:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEe-0007o2-V3 for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:41 -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 1q1UEZ-00062e-Ox; Tue, 23 May 2023 11:47:35 -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=N0idJZLV/UWClg2zff4XO/ODyV+Wgqg83zaOglG3ak8=; b=UXoU9H70RsF1Vq/trnhh qJknHUtObClNCPy5M12CaO+M0XYWb5B8Vy9thdskqdgDNSADNdRtK+eoU1D7MHN6hpnixM/XyjLo3 iEpjBa2FIKisyoDvQY0FCAddxrP4cVwzoDfAwHW9Dxw/ML3BFYWBs8feVdEn0+R03GzmTPLtuYybX d//ueXy8FljNBkMLnwbkZLVO+IOKXgG4SHcHhvFCifIMw5CYVQOQiX/lhFvXKEzltkPEnQ9+2mVyk qefB70uwtBzO+sQCMVmrfG5QSgxGs/iQpWY9z/2iyJK8eMgRpQYLgIDxlWHTqiDizh98Z9sNZUt1D j0QqJuv9rsl9WA==; 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 1q1UEY-0002jp-RK; Tue, 23 May 2023 11:47:35 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:22 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/xorg.scm (libpciaccess-0.17): New variable. --- gnu/packages/xorg.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f3d30c0ff1..93a2cca15d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1145,6 +1146,22 @@ (define-public libpciaccess (description "Xorg Generic PCI access library.") (license license:x11))) +(define-public libpciaccess-0.17 + (package + (inherit libpciaccess) + (name "libpciaccess") + (version "0.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libpciaccess-" + version + ".tar.xz")) + (sha256 + (base32 + "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l")))))) + (define-public libpthread-stubs (package (name "libpthread-stubs") -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 02/11] gnu: hurd: Update libpciaccess to 0.17. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:03 +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.168485686530079 (code B ref 63527); Tue, 23 May 2023 15:48:03 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:47:45 +0000 Received: from localhost ([127.0.0.1]:40208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEi-0007ow-9v for submit@debbugs.gnu.org; Tue, 23 May 2023 11:47:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEf-0007o4-Qv for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:42 -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 1q1UEa-00062w-Jy; Tue, 23 May 2023 11:47:36 -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=TgfpaGE0NEs6Jtld08LHQ9rlu4dkSzIPnpKLF/+zaGQ=; b=X331s+u1sAa43gzgpliR 713IUrqIBQXhvuIr8ofG5yZOu5+P5+H538HgzfrUjh+J87tNiYdf44/NUF0iQwW2ARiF15638MM4y RQtRzPJekLg9pxGRcv0w0otIR7sFBPurkCTyGJb1+Eiiz3gWeM9QU3MyOK9yn3fFYzJAm+FbSzoWc SOoL4Zkbm7Lf6fRrMlobEE0p8++mp2e3wum5EN57S8V2hSPFcNBHoBodu0yjesbC5hqPN4vfNY+QT LSWuIE66mLMNN19LWB22WjL53Z7wzuMqtHM8TGqxbacOA0Nz5bZ8katu1nIFlB8pJQqKm2HLi/OvN 5lARwlhMI9UFWQ==; 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 1q1UEa-0002jp-70; Tue, 23 May 2023 11:47:36 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:23 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) As suggested by youpi on IRC https://logs.guix.gnu.org/hurd/2023-05-17.log#132259 libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific patches while libpciaccess-0.17 works out of the box. * gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17. (netdde)[inputs]: Likewise. --- gnu/packages/hurd.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index a0133482b7..d8b4dcaf4f 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018, 2020-2023 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Rene Saavedra ;;; @@ -45,7 +45,7 @@ (define-module (gnu packages hurd) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) #:use-module (gnu packages onc-rpc) - #:use-module (gnu packages xorg) ; libpciaccess + #:use-module (gnu packages xorg) ;libpciaccess-0.17 #:use-module (guix git-download) #:export (hurd-system? hurd-target?)) @@ -536,7 +536,7 @@ (define-public hurd `(("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("unifont" ,unifont) - ("libpciaccess" ,libpciaccess) + ("libpciaccess" ,libpciaccess-0.17) ;; For NFS support ("libtirpc" ,libtirpc/hurd) @@ -634,7 +634,7 @@ (define-public netdde "/bin")) #t))))) (inputs - (list hurd libpciaccess zlib)) + (list hurd libpciaccess-0.17 zlib)) (native-inputs `(("coreutils" ,coreutils) ("gawk" ,gawk) -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 03/11] gnu: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:03 +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.168485687430176 (code B ref 63527); Tue, 23 May 2023 15:48:03 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:47:54 +0000 Received: from localhost ([127.0.0.1]:40224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEr-0007qW-0r for submit@debbugs.gnu.org; Tue, 23 May 2023 11:47:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEg-0007o6-Mb for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:43 -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 1q1UEb-00063I-F6; Tue, 23 May 2023 11:47:37 -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=hukt6ZD+CWCs/RFSS3WwhaKtRyvuFawWotXzel7Vz2w=; b=F5ZMqtZCf7FLlMzOuj8q ZCn8zdIWULsRlZuopixNcBD7lTR7v8uLEfTdl5VPQlyKvjL3LNwM6osKhUQ5g+MHqPvoPak76a8Kk T0vM6sqEq0fDfNKOXSGIQDyfzcyaGrPdv5hLMzHYuanSbbWZ1EdSqb8MOmCToqMTqW0yxToBeApPQ tThALu7sjAHZuCpGgnWOr9n5q9evIpzfysaYU/CI76fYQ51tr3HC5Uuiuqy8wCnPhVlGu99cTWbwn 7SlvmMU77LsKryOCKQknppBD+qd8QCBbyZPsr8BRJsp3UgL+0MM4VWI5SpXpmoOrsB+69G8PEgsi+ HL8Ug1kIOzySVQ==; 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 1q1UEb-0002jp-2G; Tue, 23 May 2023 11:47:37 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:24 +0200 Message-Id: <4c2e940870b39b16d69a7855a5724e37e78bfbdd.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This uses the Debian Salsa rumpkernel package git as upstream as that is where delopment happens. Once things have stabalized upstream may change to the NetBSD git from where Debian takes their snapshots. * gnu/packages/hurd.scm (rumpkernel): New variable. (hurd-headers)[native-inputs]: Use cross-mig directly. (gnumach)[native-inputs]: Likewise. (hurd)[native-inputs]: Likewise. --- gnu/packages/hurd.scm | 246 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 234 insertions(+), 12 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index d8b4dcaf4f..ff925eed75 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -33,6 +33,7 @@ (define-module (gnu packages hurd) #:use-module (guix build-system trivial) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages cross-base) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages gnupg) @@ -162,9 +163,7 @@ (define-public hurd-headers (list autoconf automake (if (%current-target-system) - (let* ((cross-base (resolve-interface '(gnu packages cross-base))) - (cross-mig (module-ref cross-base 'cross-mig))) - (cross-mig (%current-target-system))) + (cross-mig (%current-target-system)) mig))) (arguments `(#:phases @@ -296,10 +295,8 @@ (define-public gnumach (list autoconf automake (if (%current-target-system) - (let* ((cross-base (resolve-interface '(gnu packages cross-base))) - (cross-mig (module-ref cross-base 'cross-mig))) - (cross-mig (%current-target-system))) - mig) + (cross-mig (%current-target-system)) + mig) perl texinfo-4)) (supported-systems %hurd-systems) @@ -551,11 +548,9 @@ (define-public hurd `(("autoconf" ,autoconf) ("automake" ,automake) ("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config' - ("mig" ,(if (%current-target-system) - (let* ((cross-base (resolve-interface '(gnu packages cross-base))) - (cross-mig (module-ref cross-base 'cross-mig))) - (cross-mig (%current-target-system))) - mig)) + ("mig" , (if (%current-target-system) + (cross-mig (%current-target-system)) + mig)) ("pkg-config" ,pkg-config) ("perl" ,perl) ("texinfo" ,texinfo-4) @@ -651,3 +646,230 @@ (define-public netdde ;; Some drivers are dually licensed with the options being GPLv2 or one ;; of MPL/Expat/BSD-3 (dependent on the driver). (license gpl2)))) + +(define-public rumpkernel + (let ((commit "ec2ab9612be4dc48a316a21a0c96d3388478a064") + (revision "2")) + (package + (name "rumpkernel") + (version (git-version "0-20211031" revision commit)) + ;; This uses the Debian Salsa rumpkernel package git as upstream as that + ;; is where delopment happens. Once things have stabalized, upstream + ;; may change to the NetBSD git from where Debian takes their snapshots. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/hurd-team/rumpkernel.git") + (commit commit))) + (sha256 + (base32 + "1ypjg3jyzhh3gnanmk6fh76dwl5ml78n311nbi0hw7f7hygzn7vk")) + (file-name (git-file-name name commit)))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:modules '((srfi srfi-26) + (ice-9 match) + (ice-9 rdelim) + (guix build utils) + (guix build gnu-build-system)) + ;; As we are using the Debian package as upstream, we follow their + ;; build: + ;; * apply patches in debian/patches taken from the + ;; debian/patches/series file + ;; * for the configure, make, and install stages, follow + ;; the code in debian/rules + ;; The Debian patchset includes a cross build feature that we + ;; use with two differences + ;; * Debian uses a multiarch toolchain + ;; * we use cross-mig + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patches + (lambda* (#:key target #:allow-other-keys) + (let* ((patch-directory "debian/patches/") + (series (string-append patch-directory "series")) + (text (with-input-from-file series read-string)) + (lines (string-split (string-trim-right text) #\newline)) + (patches (filter (negate (cute string-prefix? "#" <>)) + lines)) + (patch-files (map + (cute string-append patch-directory <>) + patches))) + (for-each + (cute invoke "patch" "--force" "-p1" "-i" <>) + patch-files) + ;; Somewhere in the build.sh/make process MIG is not being + ;; exported, apparently. + (when target + (substitute* "pci-userspace/src-gnu/Makefile.inc" + (("MIG=mig") + (string-append "MIG=" target "-mig"))))))) + (add-before 'configure 'setenv + (lambda* (#:key build target #:allow-other-keys) + (define (noisy-setenv name value) + (setenv name value) + (format (current-error-port) "set ~a=~s\n" name value)) + (noisy-setenv "HOST_CC" "gcc") + (when target + (noisy-setenv "MIG" (string-append target "-mig"))) + (let ((target (or target build))) + (noisy-setenv "TARGET_AR" (string-append target "-ar")) + (noisy-setenv "TARGET_CC" (string-append target "-gcc")) + (noisy-setenv "TARGET_CXX" (string-append target "-g++")) + (noisy-setenv "TARGET_LD" (string-append target "-ld")) + (noisy-setenv "TARGET_MIG" (string-append target "-mig")) + (noisy-setenv "TARGET_NM" (string-append target "-nm"))) + (setenv "PAWD" "pwd") + (for-each + (cute noisy-setenv <> "") + '("_GCC_CRTENDS" + "_GCC_CRTEND" + "_GCC_CRTBEGINS" + "_GCC_CRTBEGIN" + "_GCC_CRTI" + "_GCC_CRTN")) + (noisy-setenv "BSDOBJDIR=" (string-append (getcwd) "/obj")))) + (replace 'configure + (lambda args + (let ((configure (assoc-ref %standard-phases 'configure))) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (apply configure args))))) + ;; The build has three toplevel entry points + ;; * buildrump.sh/src/build.sh: create a NetBSD-compatible + ;; toolchain and supports cross-compiling + ;; * buildrump.sh/src/lib/librumpuser: the librump* libraries + ;; * pci-userspace/src-gnu: the librumpdev_pci* libraries + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (let* ((jobs (if parallel-build? (parallel-job-count) 1)) + (host-cpu (match #$(or (%current-target-system + (%current-system))) + ("i586-pc-gnu" "i386") + ("i686-linux" "i386") + ("x86_64-linux" "amd64"))) + (toprump (string-append + (getcwd) + "/buildrump.sh/src/sys/rump")) + (rump-make (string-append + (getcwd) + "/buildrump.sh/src/obj/tooldir/bin/nbmake-" + host-cpu))) + (mkdir "obj") + (with-directory-excursion "buildrump.sh/src" + (invoke + "sh" "build.sh" + "-V" "TOOLS_BUILDRUMP=yes" + "-V" "MKBINUTILS=no" + "-V" "MKGDB=no" + "-V" "MKGROFF=no" + "-V" (string-append "TOPRUMP=" toprump) + "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" + "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" + "-V" (string-append + "CPPFLAGS=" + " -I../../obj/destdir." host-cpu "/usr/include" + " -D_FILE_OFFSET_BITS=64" + " -DRUMP_REGISTER_T=int" + " -DRUMPUSER_CONFIG=yes" + " -DNO_PCI_MSI_MSIX=yes" + " -DNUSB_DMA=1") + "-V" (string-append + "CWARNFLAGS=" + " -Wno-error=maybe-uninitialized" + " -Wno-error=address-of-packed-member" + " -Wno-error=unused-variable" + " -Wno-error=stack-protector" + " -Wno-error=array-parameter" + " -Wno-error=array-bounds" + " -Wno-error=stringop-overflow") + "-V" "LIBCRTBEGIN=" + "-V" "LIBCRTEND=" + "-V" "LIBCRT0=" + "-V" "LIBCRTI=" + "-V" "_GCC_CRTENDS=" + "-V" "_GCC_CRTEND=" + "-V" "_GCC_CRTBEGINS=" + "-V" "_GCC_CRTBEGIN=" + "-V" "_GCC_CRTI=" + "-V" "_GCC_CRTN=" + "-U" + "-u" + "-T" "./obj/tooldir" + "-m" host-cpu + "-j" (number->string jobs) + "tools" + "rump")) + (with-directory-excursion "buildrump.sh/src/lib/librumpuser" + (setenv "RUMPRUN" "true") + (invoke rump-make "dependall")) + (with-directory-excursion "pci-userspace/src-gnu" + (invoke rump-make "dependall"))))) + (replace 'install + (lambda _ + (define (install-file file target) + (let ((dest (string-append target (basename file)))) + (format (current-output-port) "`~a' -> `~a'~%" file dest) + (mkdir-p (dirname dest)) + ;; Some libraries are duplicated/copied around in the + ;; build system, do not fail trying to install one + ;; a second time. + (if (file-exists? dest) + (format (current-error-port) + "warning: skipping: ~a\n" file) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest))))))) + (let ((header (string-append #$output "/include/rump")) + (lib (string-append #$output "/lib/"))) + (mkdir-p header) + (copy-recursively "buildrump.sh/src/sys/rump/include/rump" + header) + (mkdir-p lib) + (for-each + (cute install-file <> lib) + (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") + (find-files "obj" "librump.*[.](a|so.*)"))))))))) + (inputs + (list gnumach-headers libpciaccess-0.17)) + (native-inputs + (list autoconf + automake + libgcrypt + (if (%current-target-system) + (cross-mig (%current-target-system)) + mig) + zlib)) + (supported-systems %hurd-systems) + (home-page "https://wiki.netbsd.org/rumpkernel") + (synopsis "NetBSD as rumpkernel for the GNU/Hurd") + (description + "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that +the Hurd may be installed on iron. Using this rumpkernel package, the hurd +package's rumpdisk can be built which provides the pci.arbiter and rumpdisk +servers.") + (license + ;; The NetBSD rumpkernel code is a big hodgepodge of softwares many of + ;; which have their own different licensing terms, see also + ;; https://salsa.debian.org/hurd-team/rumpkernel/-/blob/master/debian/copyright + (list asl2.0 + boost1.0 + bsd-2 + bsd-3 + bsd-4 + cddl1.0 + expat + gpl1 + gpl2+ + gpl3+ + isc + lgpl2.0+ + public-domain + (@ (guix licenses) zlib) + (non-copyleft "file://src/lib/libc/hash/hashhl.c" + "See debian/copyright in the distribution.")))))) -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 04/11] gnu: Add hurd-shouldbeinlibc. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:04 +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.168485687430185 (code B ref 63527); Tue, 23 May 2023 15:48:04 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:47:54 +0000 Received: from localhost ([127.0.0.1]:40226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEr-0007qe-RI for submit@debbugs.gnu.org; Tue, 23 May 2023 11:47:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEh-0007o8-HK for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:43 -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 1q1UEc-00063e-Ae; Tue, 23 May 2023 11:47:38 -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=4lujRISaolg0/WMf9r50ELTSzhJKk7H5EwPRJvg9a5Y=; b=Dc7XsKn84v18Hx5+1K/d mAZMaPqHd4obCHAqse61RGVr5l8p5XevBebrXhdrH7OWBH1EG2LG39lI2Z58bVT/a/0wk6stdqPyy 9O3/YNhLFfQwmsa0OMRag2s/tVEF0Weg6OVrlgAfvMN0VGMCzqQ81u2KVCF5dYcdSGIDkZ7m3Wj3Y V6tsBfzx4jk9yAq2vflmH2rpfE2Qnb1H6FnoUyU4k1BhEzf9badLC8G7kCRA25WL+bUbuOSyxkiCI vXW1JN8w7cuoVrvMcsRh9SjoVzMEEQ4SX445ILUb1C5FvMCXdez0HKflIaDiY7EwtoF8RJNUxQjjK 5t2wE4Yx+zbQ9A==; 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 1q1UEb-0002jp-TM; Tue, 23 May 2023 11:47:38 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:25 +0200 Message-Id: <4708bb318a328b1aafd3f748fb1766844759aabd.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd-shouldbeinlibc): New variable. --- gnu/packages/hurd.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index ff925eed75..9fbca9d5c5 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -240,6 +240,30 @@ (define-public hurd-minimal Library for GNU/Hurd.") (license gpl2+))) +(define-public hurd-shouldbeinlibc + (package + (inherit hurd-headers) + (name "hurd-shouldbeinlibc") + (inputs (list glibc/hurd-headers gnumach-headers)) + (arguments + (substitute-keyword-arguments (package-arguments hurd-headers) + ((#:make-flags flags '()) + #~'("lib-subdirs=libshouldbeinlibc libstore" + "prog-subdirs=" + "other-subdirs=" + #$@flags)) + ((#:phases _) + #~%standard-phases) + ((#:validate-runpath? validate-runpath? #f) + #f))) + (supported-systems %hurd-systems) + (home-page "https://www.gnu.org/software/hurd/hurd.html") + (synopsis "GNU Hurd libshouldbeinlibc library") + (description + "This package provides libshouldbeinlibc and libstore, needed to build +parted for GNU/Hurd.") + (license gpl2+))) + (define-public hurd-core-headers (package (name "hurd-core-headers") -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 05/11] gnu: parted: Support building for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:05 +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.168485687530195 (code B ref 63527); Tue, 23 May 2023 15:48:05 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:47:55 +0000 Received: from localhost ([127.0.0.1]:40228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEs-0007qo-9x for submit@debbugs.gnu.org; Tue, 23 May 2023 11:47:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEi-0007oA-I9 for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:45 -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 1q1UEd-00063x-AX; Tue, 23 May 2023 11:47:39 -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=qR4kXs0jETPp81H2aGrDPPvydsfBoDfYYQu35k44grE=; b=iidw9ijMOwY7xuxmv4jP OR5mEPjm9LMT/esVaYLQVfYOdtIKSvaKspse4TBB2hnbwXnx/J4A3UkcGwNOytpXWrwAOLRtg8jIu ExhkyqLG5ADzzpaFFIEBrddaQ5frcf5ewk2Tn6TkrzOpfO0W/oIN93nYNPYsrxryv2oDGQJRblzKa X9n/DNL+VFuzPNo2LbO4YyBwMI67IrWQRfESIKcD6OHwkiFYF54HE9WW1RAu1ilWDySO1qi7UDbz8 KLNuiIpqJ6AnctLqjpq76mf0ZGf8N9iwcCYXMN51dDANkw14iix9Aiq59ov7rkD7KhQqgJdRMVl+x g56LXvWWh2gT3g==; 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 1q1UEc-0002jp-PE; Tue, 23 May 2023 11:47:39 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:26 +0200 Message-Id: <71a14f2a5b28b90b2a996b1afab6e39c101dfa1d.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/disk.scm (parted)[inputs]: Remove lvm2, add hurd-shouldbeinlibc when building for the Hurd. [arguments]: Add configure-flag '--disable-device-mapper' when building for the Hurd. --- gnu/packages/disk.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 894a542171..760e9cd8f6 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Hartmut Goebel @@ -67,6 +67,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hurd) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) @@ -249,17 +250,25 @@ (define-public parted "18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29")))) (build-system gnu-build-system) (arguments - (list #:phases + (append + (if (hurd-target?) + '(#:configure-flags '("--disable-device-mapper")) + '()) + (list + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-locales-and-python (lambda _ (substitute* "tests/t0251-gpt-unicode.sh" (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales (substitute* "tests/msdos-overlap" - (("/usr/bin/python") (which "python")))))))) + (("/usr/bin/python") (which "python"))))))))) (inputs - (list lvm2 readline - `(,util-linux "lib"))) + `(,@(if (hurd-target?) + (list hurd-shouldbeinlibc) + (list lvm2)) + ,readline + (,util-linux "lib"))) (native-inputs (list gettext-minimal -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 00/11] Rumpdisk support for the Hurd, really, *really*! References: In-Reply-To: Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:06 +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.168485688230256 (code B ref 63527); Tue, 23 May 2023 15:48:06 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:02 +0000 Received: from localhost ([127.0.0.1]:40230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEs-0007qy-VI for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEd-0007o0-Ag for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:45 -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 1q1UEY-00061q-10; Tue, 23 May 2023 11:47:34 -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:Subject:To:From:in-reply-to: references; bh=vEcmm0p9/hhokiDr8ASUoK//9+c6jhpxX/tApfTKYyg=; b=YxYcSdQqT2XT5d ZNG0YyezwX+oVQ5C0P5BiXScrq1ItWpFMMjCtYYtieIPawkXOteI8mCP1XrTPETqi4UF+XbRlEtuh bBCm+CxYURVfnst7SrXC2m4toaRvAx3m/0aAjuNRHN++oUSmZEnDaha3wFCEJCQhj9jF9g4rOdf1b Fh6spRBdy4QIEDwo3DPQ5svCcVaQnQR6Z9awqPKfJkxs2xuGO9tqkgNTg2ngT95KSnELPHEeWsVlA 3uFu1TOqhk4WeEdAHBnJdKr111Mz/Gnn74bOHBdMRfqzn6bkNRZZZK88fRtGV/yxOwCU8S0pwSdXQ RADrA0gFbTr8pHQFG9gA==; 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 1q1UEX-0002jp-Jd; Tue, 23 May 2023 11:47:33 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:21 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! So, with lots of kind help from the folks at #hurd and bug-hurd, and many thanks to Josselin Poiret for sending their amazing "Add libc specific to Hurd and update components" patch set (https://issues.guix.gnu.org/63641, note that these series depend on this!) we now have rumpdisk support for the Hurd. To actually use it instead of the gnumach builtin IDE driver, use (kernel-arguments '("noide")) To test this, I'm using this patch --8<---------------cut here---------------start------------->8--- diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 463c7ee798..f3d54be79d 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -33,7 +33,7 @@ (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader) (targets '("/dev/sdX")))) + (kernel-arguments '("console=com0" "noide")) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") --8<---------------cut here---------------end--------------->8--- build it using --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix system image -t hurd-raw gnu/system/examples/bare-hurd.tmpl --keep-failed --8<---------------cut here---------------end--------------->8--- and run it like this --8<---------------cut here---------------start------------->8--- guix shell qemu -- qemu-system-i386 \ -m 4096 \ --enable-kvm \ --device rtl8139,netdev=net0 \ --netdev user,id=net0,hostfwd=tcp:0.0.0.0:11022-:2222 \ --snapshot \ --no-reboot \ --device virtio-serial-pci \ --nographic \ --serial mon:stdio \ --hda /gnu/store/l35gz57nrkngc923f9zp9awxmq7ha1hc-disk-image --8<---------------cut here---------------end--------------->8--- (It also still works without using "noide", we're still using that for childhurd service where rumpdisk does not really make sense). Enjoy! Greetings, Janneke Janneke Nieuwenhuizen (11): gnu: Add libpciaccess-0.17. gnu: hurd: Update libpciaccess to 0.17. gnu: Add rumpkernel. gnu: Add hurd-shouldbeinlibc. gnu: parted: Support building for the Hurd. gnu: hurd: Add rumpkernel. hurd-boot: Setup pci-arbiter and rumpdisk translators. services: childhurd: Bump default qemu memory to 2048MB. system: hurd: Boot with pci.arbiter and rumpdisk. bootloader: grub: Use rumpdisk-style root when booting with "noide". gnu: gnumach: Support "noide" argument. doc/guix.texi | 21 ++ gnu/bootloader/grub.scm | 17 +- gnu/build/hurd-boot.scm | 27 +- gnu/local.mk | 3 + gnu/packages/disk.scm | 19 +- gnu/packages/hurd.scm | 298 ++++++++++++++++-- .../patches/gnumach-support-noide.patch | 25 ++ .../patches/hurd-fix-rumpdisk-build.patch | 41 +++ .../patches/hurd-rumpdisk-no-hd.patch | 26 ++ gnu/packages/xorg.scm | 17 + gnu/services/virtualization.scm | 4 +- gnu/system.scm | 25 +- gnu/system/examples/bare-hurd.tmpl | 4 +- 13 files changed, 480 insertions(+), 47 deletions(-) create mode 100644 gnu/packages/patches/gnumach-support-noide.patch create mode 100644 gnu/packages/patches/hurd-fix-rumpdisk-build.patch create mode 100644 gnu/packages/patches/hurd-rumpdisk-no-hd.patch base-commit: 88da863e0048721cef17a5de294084be1f10e7e9 -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 06/11] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:06 +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.168485688330280 (code B ref 63527); Tue, 23 May 2023 15:48:06 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:03 +0000 Received: from localhost ([127.0.0.1]:40232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF0-0007rx-8g for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEj-0007oF-Co for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:46 -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 1q1UEe-000647-6O; Tue, 23 May 2023 11:47:40 -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=HKVhcVErPnQZVQiW5dwfVMk4PSdkHOdTv5Z1kP3Fwxo=; b=RsqDLA9gxj9fXtIssovj 1da1uXmJJqM/EHb+fwtuy+sQIdm1E6f6ob4J4CK0e6CUxY4nzg+RiRPiRlosHnczIrbd1wXLM8tLu CjsUmY4nosx/8i87X5DTNJZd6IHYkWaBA3EVlU1gw02CfFKuRo7OOpOtntLA4VQBIKo+poW16s6Vj ktH23ENpye+pl5MCXWf5K7g7PVYqIVGeiNhvOxtruYSTsuYCkM94I5dP92uqUKrfH+YCPdbmIiDsp 4esInUAhnkiG/W9Dzy3D+JzSwdhvB+WgiigUQ7l8xMDBecWBVOb0vaOHkF7s3b0yOj6EUmzDTpb3x /w5aaIZhJ9QsGg==; 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 1q1UEd-0002jp-PK; Tue, 23 May 2023 11:47:39 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:27 +0200 Message-Id: <5995550d8ce78db5a5d52198201c256275bbb954.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/hurd-fix-rumpdisk-build.patch, gnu/packages/patches/hurd-rumpdisk-no-hd.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/hurd.scm (hurd-headers): Use them. (hurd)[inputs]: Add util-linux:static, parted, rumpkernel. [arguments]: Rename `prepare-dde' phase to 'prepare-addons'. Add "rumpdisk" directory. Add --enable-static-progs=... option to #:configure-flags, and remove --without-parted. --- gnu/local.mk | 2 + gnu/packages/hurd.scm | 17 +++++--- .../patches/hurd-fix-rumpdisk-build.patch | 41 +++++++++++++++++++ .../patches/hurd-rumpdisk-no-hd.patch | 26 ++++++++++++ 4 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/hurd-fix-rumpdisk-build.patch create mode 100644 gnu/packages/patches/hurd-rumpdisk-no-hd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2a09d44506..052b76ea7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1354,6 +1354,8 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-add-without-rump-configure-option.patch \ + %D%/packages/patches/hurd-fix-rumpdisk-build.patch \ + %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \ %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9fbca9d5c5..536df96e00 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -34,6 +34,7 @@ (define-module (gnu packages hurd) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) + #:use-module (gnu packages disk) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages gnupg) @@ -157,7 +158,9 @@ (define-public hurd-headers (sha256 (base32 "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (patches (search-patches "hurd-fix-rumpdisk-build.patch" + "hurd-rumpdisk-no-hd.patch")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -366,7 +369,7 @@ (define-public hurd (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-dde + (add-after 'unpack 'prepare-addons (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) @@ -380,7 +383,7 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit")))) + "libbpf libmachdevdde libddekit rumpdisk")))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -543,10 +546,10 @@ (define-public hurd #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi" "--disable-ncursesw" "--without-libbz2" "--without-libz" - "--without-parted" ;; This is needed to pass the configure check for ;; clnt_create "ac_func_search_save_LIBS=-ltirpc" @@ -567,7 +570,11 @@ (define-public hurd ("coreutils" ,coreutils) ("sed" ,sed) ("grep" ,grep) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux) +;; ("util-linux" ,util-linux "lib") ;libuuid.so, for parted + ("util-linux" ,util-linux "static") ;libuuid.a, for parted + ("parted" ,parted) ;for rumpdisk + ("rumpkernel" ,rumpkernel))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/patches/hurd-fix-rumpdisk-build.patch b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch new file mode 100644 index 0000000000..4ecd5ed0ee --- /dev/null +++ b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch @@ -0,0 +1,41 @@ +Upstream status: taken from upstream. + +From a2b0f721d077fdc5c9decb21b975b58fb51a3e8f Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Mon, 22 May 2023 19:21:47 +0200 +Subject: [PATCH] rumpdisk: Do not assume FHS /usr/lib, fixes Guix cross-build. + +--- + rumpdisk/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/rumpdisk/Makefile b/rumpdisk/Makefile +index 60a209b3..b59aaf9a 100644 +--- a/rumpdisk/Makefile ++++ b/rumpdisk/Makefile +@@ -1,5 +1,5 @@ + # +-# Copyright (C) 2019 Free Software Foundation, Inc. ++# Copyright (C) 2019, 2023 Free Software Foundation, Inc. + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License as +@@ -15,7 +15,6 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +-RUMPPATH=/usr/lib + RUMPLIBS=rump rumpuser rumpdev rumpdev_disk rumpdev_pci rumpvfs rumpdev_ahcisata rumpdev_piixide rumpdev_ata + RUMPEXTRA=rumpdev_scsipi + +@@ -38,6 +37,6 @@ target = rumpdisk + OBJS = $(SRCS:.c=.o) + HURDLIBS = machdev ports trivfs shouldbeinlibc iohelp ihash fshelp + LDLIBS += -lpthread -lpciaccess -ldl +-LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=$(RUMPPATH)/lib%_pic.a) -Wl,--no-whole-archive $(RUMPEXTRA:%=$(RUMPPATH)/lib%_pic.a) ++LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=-l%_pic) -Wl,--no-whole-archive $(RUMPEXTRA:%=-l%_pic) + + include ../Makeconf +-- +2.40.1 + diff --git a/gnu/packages/patches/hurd-rumpdisk-no-hd.patch b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch new file mode 100644 index 0000000000..4e5d41917d --- /dev/null +++ b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch @@ -0,0 +1,26 @@ +This avoids rumpdisk crash when booting without "noide". + +Upstream status: Taken from Debian Salsa package git + + https://salsa.debian.org/hurd-team/hurd/-/blob/f40ff84260b5a98bea949013415a1c92c127a43e/debian/patches/rumpdisk-no-hd + +Index: hurd-debian/rumpdisk/block-rump.c +=================================================================== +--- hurd-debian.orig/rumpdisk/block-rump.c ++++ hurd-debian/rumpdisk/block-rump.c +@@ -143,7 +143,6 @@ rumpdisk_device_init (void) + { + device_t device; + +-#if 0 + if (! device_open (device_master, D_READ, "hd0", &device) + || ! device_open (device_master, D_READ, "hd1", &device) + || ! device_open (device_master, D_READ, "hd3", &device) +@@ -154,7 +153,6 @@ rumpdisk_device_init (void) + disabled = 1; + return; + } +-#endif + + if (! device_open (device_master, D_READ, "sd0", &device) + || ! device_open (device_master, D_READ, "sd1", &device) -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 07/11] hurd-boot: Setup pci-arbiter and rumpdisk translators. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:07 +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.168485688530313 (code B ref 63527); Tue, 23 May 2023 15:48:07 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:05 +0000 Received: from localhost ([127.0.0.1]:40235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF2-0007sL-Gq for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEk-0007oJ-7V for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:46 -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 1q1UEf-00064O-11; Tue, 23 May 2023 11:47:41 -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=8N6feLo5kn4RP/kvaZN7h7YRCEDqTxBLgcHl14eYrhE=; b=iTQHX9/NnlRb3Q5Dr0AH SuOpnrUaDaRSX6m9apkhCujOMUttrkQ+frEAcarDID9sLB71nrSV8gLT5+lPqI42zRdenUrsRA6Ng 8OrYDPujvBvVif8xm1Xngwt2APsIAIdqNVUU59tfwsPlG2F3G71UZBlJWFOdSLpMqNJJ2FpW24mEJ F4Vki20ALlhFid63JijSI9Z8jCN6nylvIjEOLUJyBAbjthqSwfN6l91XoQzaSz25EMtW5xP1gs248 8Je7jFJrjKqw/qhz3UWrDH8TfFeOB6D7HGZd1QAlvkz5sZ1ugOLKk9Wg+dAMMXp3mKYw8vL7ydXTZ Zl0T24YGI6g+mA==; 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 1q1UEe-0002jp-K6; Tue, 23 May 2023 11:47:40 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:28 +0200 Message-Id: <80f8fd0cb008971867e8b550535d7e4673d532c7.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "servers/bus/pci. (set-hurd-device-translators): Create transators for pci-arbiter, rumpdisk, and /dev/wd0..4s1..4. --- gnu/build/hurd-boot.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 14bfc5e809..93324ac3f3 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020-2022 Ludovic Courtès -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,7 +105,7 @@ (define* (make-hurd-device-nodes #:optional (root "/")) ;; TODO: Set the 'gnu.translator' extended attribute for passive translator ;; settings? - ) + (mkdir-p (scope "servers/bus/pci"))) (define (passive-translator-xattr? file-name) "Return true if FILE-NAME has an extended @code{gnu.translator} attribute @@ -183,7 +183,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) (mkdir-p dir)))) (define servers - '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + '(("servers/bus/pci" ("/hurd/pci-arbiter")) + ("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) ("servers/crash-kill" ("/hurd/crash" "--kill")) ("servers/crash-suspend" ("/hurd/crash" "--suspend")) ("servers/password" ("/hurd/password")) @@ -216,6 +217,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) ;; 'fd_to_filename' in libc expects it. ("dev/fd" ("/hurd/magic" "--directory" "fd") #o555) + ("dev/rumpdisk"("/hurd/rumpdisk") #o660) + ;; Create a number of ttys; syslogd writes to tty12 by default. ;; FIXME: Creating /dev/tty12 leads the console client to switch to ;; tty12 when syslogd starts, which is confusing for users. Thus, do @@ -239,7 +242,22 @@ (define* (set-hurd-device-translators #:optional (root "/")) ("/hurd/term" ,(string-append "/dev/ttyp" n) "pty-slave" ,(string-append "/dev/ptyp" n)) #o666)))) - (iota 10 0)))) + (iota 10 0)) + ,@(append-map (lambda (n) + (let* ((n (number->string n)) + (drive (string-append "dev/wd" n)) + (disk (string-append "@/dev/disk:wd" n))) + `((,drive ("/hurd/storeio" ,disk) #o600) + ,@(map (lambda (p) + (let ((p (number->string p))) + `(,(string-append drive "s" p) + ("/hurd/storeio" + "--store-type=typed" + ,(string-append + "part:" p ":device:@/dev/disk:wd0")) + #o660))) + (iota 4 1))))) + (iota 4 0)))) (for-each scope-set-translator servers) (mkdir* "dev/vcs/1") @@ -252,6 +270,7 @@ (define* (set-hurd-device-translators #:optional (root "/")) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) (false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash"))) + (false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk"))) ;; Make sure /etc/mtab is a symlink to /proc/mounts. (false-if-exception (delete-file (scope "etc/mtab"))) -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 08/11] services: childhurd: Bump default qemu memory to 2048MB. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:08 +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.168485688630333 (code B ref 63527); Tue, 23 May 2023 15:48:08 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:06 +0000 Received: from localhost ([127.0.0.1]:40241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF3-0007t2-HA for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEl-0007oR-4k for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:48 -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 1q1UEf-00064h-Rs; Tue, 23 May 2023 11:47:41 -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=F0KHbkmowOUoMnkfiwWnCrMd51634guTs85JYVsMkgI=; b=af/BoN+iaYmG4HlILGsa UcKho7KC6LeBk708cwd3Q8US/0FLA4R0LwT9qpZZuC/DeapVJ5WZjfsJfe+bgYqEOYdLRou+92MbK y9lb/bK6Cq1yDWo+7eY1NyWyvVyBaGNR76EFDawyJOS7ShvhD4w55vswFCh6PBVY5yjA4pdLZuEuw 4P0Mu4UTeQv/XPP8EHLBC22fAWjWtxo8/yKo6wdJbv+F20SpdI/BJ29bSv/Tq+3BtPWjEwK6codwb 51RvNqyr0vb4Uq/ydf9Zo7nNeaSfJePSu8Z8L0xRR4Ue1TCmKjlZkggRm+/cFbOpWdx4qxr9xDD9z JWGSypTvAcXaEA==; 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 1q1UEf-0002jp-FG; Tue, 23 May 2023 11:47:41 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:29 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) When booting with pci-arbiter and rumpdisk and using 1024MB of memory for qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot messages. At least 1200MB is required, currently. * gnu/services/virtualization.scm ()[memory-size]: Bump to 2048. * gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too. Update example `guix system image' and "qemu" command lines too. --- gnu/services/virtualization.scm | 4 ++-- gnu/system/examples/bare-hurd.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 2e311e3813..886b73f8c7 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ryan Moe ;;; Copyright © 2018, 2020-2022 Ludovic Courtès -;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2021, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Timotej Lazar ;;; Copyright © 2022 Oleg Pykhalov ;;; Copyright © 2022 Leo Nikkilä @@ -1100,7 +1100,7 @@ (define-record-type* (disk-size hurd-vm-configuration-disk-size ;number or 'guess (default 'guess)) (memory-size hurd-vm-configuration-memory-size ;number - (default 512)) + (default 2048)) (options hurd-vm-configuration-options ;list of string (default `("--snapshot"))) (id hurd-vm-configuration-id ;#f or integer [1..] diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index f0dd0cf742..463c7ee798 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -5,12 +5,12 @@ ;; To build a disk image for a virtual machine, do ;; -;; ./pre-inst-env guix system image --target=i586-pc-gnu \ +;; ./pre-inst-env guix system image --image-type=hurd-raw \ ;; gnu/system/examples/bare-hurd.tmpl ;; ;; You may run it like so ;; -;; guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \ +;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \ ;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ ;; -snapshot -hda ;; -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 09/11] system: hurd: Boot with pci.arbiter and rumpdisk. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:08 +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.168485688730362 (code B ref 63527); Tue, 23 May 2023 15:48:08 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:07 +0000 Received: from localhost ([127.0.0.1]:40243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF4-0007tB-6K for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEl-0007oV-Ti for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:48 -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 1q1UEg-000654-Mt; Tue, 23 May 2023 11:47:42 -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=axWqy3GEnyGsVckc9XokJSfh5AEE3dKeSLtAZFiRgKs=; b=a2rXPXGgI6/7Ky8VMFF9 juPJgt45FoFIizUrl5hhzKYaF+i5OVu8DsBGSMmACfDnZIZeBDMZT/fTfX0Ls4y7cBXrgO+2jWsuU 8pjOqO/8ZoBL5QwOmYa94SXH+Ehu/46yxevTpeMJqEcsAUSiFayrz8+rK+9KYjExYvQLmd8WhhVuv se+J0KeudcYUVTzojqhmEJzm/mUoQAfJ4SRY8+vvuRQ0gMHypUPkcLkD/4nmmYKIuVDet29ZtBOlw Hyv0tu+cI57TQF6HyGQ36/0IjPTJkWW74X4wsrZaKtvoRyZQ1YuFT224nxtXvHJuFeZErqVcR5u/n Osa5y0Tk+3meJw==; 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 1q1UEg-0002jp-A0; Tue, 23 May 2023 11:47:42 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:30 +0200 Message-Id: <8334d576496a999fa12861ade14e2781423ff22f.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and rumpdisk. --- gnu/system.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..23addf41e9 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2022 Maxim Cournoyer -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework @@ -1486,16 +1486,28 @@ (define (operating-system-multiboot-modules os) (define (hurd-multiboot-modules os) (let* ((hurd (operating-system-hurd os)) + (pci-arbiter-command + (list (file-append hurd "/hurd/pci-arbiter.static") + "pci-arbiter" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--next-task='${disk-task}'" + "'$(pci-task=task-create)'" + "'$(task-resume)'")) + (rumpdisk-command + (list (file-append hurd "/hurd/rumpdisk.static") + "rumpdisk" + "--next-task='${fs-task}'" + "'$(disk-task=task-create)'")) (root-file-system-command (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" "--multiboot-command-line='${kernel-command-line}'" - "--host-priv-port='${host-port}'" - "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" "--x-xattr-translator-records" - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + "'${root}'" + "'$(fs-task=task-create)'")) (target (%current-target-system)) (libc (if target (with-parameters ((%current-target-system #f)) @@ -1512,7 +1524,10 @@ (define (hurd-multiboot-modules os) ;; (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'") (list (file-append hurd "/hurd/exec.static") "exec" "'$(exec-task=task-create)'"))) - (list root-file-system-command exec-server-command))) + (list pci-arbiter-command + rumpdisk-command + root-file-system-command + exec-server-command))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 10/11] bootloader: grub: Use rumpdisk-style root when booting with "noide". 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.168485688830377 (code B ref 63527); Tue, 23 May 2023 15:48:09 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:08 +0000 Received: from localhost ([127.0.0.1]:40248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF5-0007tf-Ip for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEm-0007oi-OR for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:49 -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 1q1UEh-00065L-HS; Tue, 23 May 2023 11:47:43 -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=1MHgAdw4ZEmYRf3DI5KP4AcSLeUwLHAPgKAr/9F/lGw=; b=gOmbFSxt5sK4A1phRMVz Pa8Cof9D4ZHkdr7MdkhG1mAc0uRznWpg5ZUNbMUdQ82psa3mNrFUiMWkh4gLT2tXrTA53jF6IRTg4 yue6ySjMlWXnGaUCEAdUZrN3TYRDnjbo4hd1ZyCgZF8t5uETheJQjBie53c3f4XsWG74T5maDzC/d 4FSTVZ6/Bt2Pf6o9X3+doMpSc+DV8l3PxM38C4z2VzbhLpxlgJy5lKXAP9ff+oq41qmN2AY4LW92a kX+ELhvPBw0tE+NWIS3pLL+eJMpvk+ZyjtesijQP+VQ83B1ecnVwsrhK7fM/xScjqZEGKhnp3ihwB 72sjQc9zI2Kkeg==; 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 1q1UEh-0002jp-52; Tue, 23 May 2023 11:47:43 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:31 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/bootloader/grub.scm (make-grub-configuration): When "noide" is in arguments, use device name "wd0" rather than "hd0". --- gnu/bootloader/grub.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index ecd44e7f3c..af46d76380 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2020 Mathieu Othacehe -;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Stefan @@ -404,17 +404,20 @@ (define* (make-grub-configuration grub config entries #$linux (string-join (list #$@arguments)) #$initrd))) (multiboot-kernel - (let ((kernel (menu-entry-multiboot-kernel entry)) - (arguments (menu-entry-multiboot-arguments entry)) - (modules (menu-entry-multiboot-modules entry)) - (root-index 1)) ; XXX EFI will need root-index 2 + (let* ((kernel (menu-entry-multiboot-kernel entry)) + (arguments (menu-entry-multiboot-arguments entry)) + (disk (if (member "noide" arguments) "w" "h")) + (modules (menu-entry-multiboot-modules entry)) + (root-index 1)) ; XXX EFI will need root-index 2 #~(format port " menuentry ~s { - multiboot ~a root=device:hd0s~a~a~a + multiboot ~a root=part:~a:device:~ad0~a~a }~%" #$label #$kernel - #$root-index (string-join (list #$@arguments) " " 'prefix) + #$root-index + #$disk + (string-join (list #$@arguments) " " 'prefix) (string-join (map string-join '#$modules) "\n module " 'prefix)))) (chain-loader -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 (); -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 06/11] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 16:02:02 +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.168485770232535 (code B ref 63527); Tue, 23 May 2023 16:02:02 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 16:01:42 +0000 Received: from localhost ([127.0.0.1]:40278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1USE-0008Sh-7j for submit@debbugs.gnu.org; Tue, 23 May 2023 12:01:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1USC-0008SN-3g for 63527@debbugs.gnu.org; Tue, 23 May 2023 12:01:40 -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 1q1US6-0001St-4U; Tue, 23 May 2023 12:01:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=+xvR5x36DitI24VY2JJsFQOXSC6Ds3FXuGb/ScaShN8=; b=Kt5Gp62HxtdAECZOnfMQ DnzzGQqcSfnEXxMX3V5DOPeBhb7G/3IEjlFSDZ4dO6L/TVvPajWC0wss5b5BwvzfyRrw21EuEDrWT ceysfqOwJhfTVaW1FXfZUqkSnpiMBQf5tAwWRrDWkTHcEnMvTlBFyz9sMfA9cK+lVd+WAgFQtM+Sb 10kQaFMeAJ2Df/WuY+0sTdYPv0ERRgjMhg9amAG47m7vlp8IDZ+LnRLZoc1yYRg3Exl45G2vAli8h 3w/4a3p1C2LJqsEQZ4jN3mIsjrl29amgZ3yeEzNgfidyaBsp6TKlt3oWFlj9oNI3nt5YxCWH82cwG P2RruAtjmhL82Q==; Received: from [2a02:a462:da03:1:2701:7f81:a736:4607] (helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1US4-0007PC-BT; Tue, 23 May 2023 12:01:33 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <5995550d8ce78db5a5d52198201c256275bbb954.1684855847.git.janneke@gnu.org> X-Url: http://AvatarAcademy.nl Date: Tue, 23 May 2023 18:01:18 +0200 In-Reply-To: <5995550d8ce78db5a5d52198201c256275bbb954.1684855847.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:27 +0200") Message-ID: <877csz3ult.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: [..] > * gnu/packages/hurd.scm (hurd-headers): Use them. > (hurd)[inputs]: Add util-linux:static, parted, rumpkernel. [..] > diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm > index 9fbca9d5c5..536df96e00 100644 > @@ -567,7 +570,11 @@ (define-public hurd > ("coreutils" ,coreutils) > ("sed" ,sed) > ("grep" ,grep) > - ("util-linux" ,util-linux))) > + ("util-linux" ,util-linux) > +;; ("util-linux" ,util-linux "lib") ;libuuid.so, for part= ed > + ("util-linux" ,util-linux "static") ;libuuid.a, for parted > + ("parted" ,parted) ;for rumpdisk > + ("rumpkernel" ,rumpkernel))) > (native-inputs > `(("autoconf" ,autoconf) > ("automake" ,automake) Oops, will remove the commented code, and also check if we can remove ("util-linux" ,util-linux) altogether. Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com .. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v6 06/11] gnu: hurd: Add rumpkernel. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 16:22:02 +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.16848588682057 (code B ref 63527); Tue, 23 May 2023 16:22:02 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 16:21:08 +0000 Received: from localhost ([127.0.0.1]:40330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Ul1-0000X6-F2 for submit@debbugs.gnu.org; Tue, 23 May 2023 12:21:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Ukw-0000WF-4N for 63527@debbugs.gnu.org; Tue, 23 May 2023 12:21:06 -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 1q1Ukq-0006M2-Uw; Tue, 23 May 2023 12:20:56 -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=Z+pImRVh4LSQRzd3eLCu/z0N+d8anrdyDBfGqh3nSPU=; b=QFcUMkwyvC7c20rPaXv/ jt4LoVsSz+nTOZxpxos85zeEf0oTEVnkwokbSvyPwtdFoPw+HpikVen3eZUsd4GiTzf919WN4kHyq OLJItzF3drcHA8PhT/SrveA75zA7DIbyDZGu5IQAn2lD++zOpG9Z5bBwyF8F72cQmsry8rW906d5H RYzL48A1Q02vMy7crbW0auKABygMZqfvNCgGptltmHzuqmSfX8V/RuzWHtBZnKhqjthMqPDtflx+F 4R73OogkM1cFntMl0+6DGVXJjMOFO9g/pOhNlDHu6ct8qUOxZAXFNGb7ngV//44ANyCUzBtb/UR+8 Wx73AC9M3+bXig==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1Uke-0004Bm-BF; Tue, 23 May 2023 12:20:56 -0400 From: Janneke Nieuwenhuizen In-Reply-To: Organization: AvatarAcademy.nl References: <5995550d8ce78db5a5d52198201c256275bbb954.1684855847.git.janneke@gnu.org> <877csz3ult.fsf@gnu.org> References: X-Url: http://AvatarAcademy.nl Date: Tue, 23 May 2023 18:20:40 +0200 Message-ID: <87wn0z2f53.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/hurd-fix-rumpdisk-build.patch, gnu/packages/patches/hurd-rumpdisk-no-hd.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/hurd.scm (hurd-headers): Use them. (hurd)[inputs]: Replace util-linux with util-linux:static, add parted, rumpkernel. [arguments]: Rename `prepare-dde' phase to 'prepare-addons'. Add "rumpdisk" directory. Add --enable-static-progs=... option to #:configure-flags, and remove --without-parted. --- gnu/local.mk | 2 + gnu/packages/hurd.scm | 15 ++++--- .../patches/hurd-fix-rumpdisk-build.patch | 41 +++++++++++++++++++ .../patches/hurd-rumpdisk-no-hd.patch | 26 ++++++++++++ 4 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/hurd-fix-rumpdisk-build.patch create mode 100644 gnu/packages/patches/hurd-rumpdisk-no-hd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2a09d44506..052b76ea7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1354,6 +1354,8 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-add-without-rump-configure-option.patch \ + %D%/packages/patches/hurd-fix-rumpdisk-build.patch \ + %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \ %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9fbca9d5c5..2687c0229c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -34,6 +34,7 @@ (define-module (gnu packages hurd) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) + #:use-module (gnu packages disk) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages gnupg) @@ -157,7 +158,9 @@ (define-public hurd-headers (sha256 (base32 "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (patches (search-patches "hurd-fix-rumpdisk-build.patch" + "hurd-rumpdisk-no-hd.patch")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -366,7 +369,7 @@ (define-public hurd (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-dde + (add-after 'unpack 'prepare-addons (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) @@ -380,7 +383,7 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit")))) + "libbpf libmachdevdde libddekit rumpdisk")))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -543,10 +546,10 @@ (define-public hurd #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi" "--disable-ncursesw" "--without-libbz2" "--without-libz" - "--without-parted" ;; This is needed to pass the configure check for ;; clnt_create "ac_func_search_save_LIBS=-ltirpc" @@ -567,7 +570,9 @@ (define-public hurd ("coreutils" ,coreutils) ("sed" ,sed) ("grep" ,grep) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "static") ;libuuid.a, for parted + ("parted" ,parted) ;for rumpdisk + ("rumpkernel" ,rumpkernel))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/patches/hurd-fix-rumpdisk-build.patch b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch new file mode 100644 index 0000000000..4ecd5ed0ee --- /dev/null +++ b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch @@ -0,0 +1,41 @@ +Upstream status: taken from upstream. + +From a2b0f721d077fdc5c9decb21b975b58fb51a3e8f Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Mon, 22 May 2023 19:21:47 +0200 +Subject: [PATCH] rumpdisk: Do not assume FHS /usr/lib, fixes Guix cross-build. + +--- + rumpdisk/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/rumpdisk/Makefile b/rumpdisk/Makefile +index 60a209b3..b59aaf9a 100644 +--- a/rumpdisk/Makefile ++++ b/rumpdisk/Makefile +@@ -1,5 +1,5 @@ + # +-# Copyright (C) 2019 Free Software Foundation, Inc. ++# Copyright (C) 2019, 2023 Free Software Foundation, Inc. + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License as +@@ -15,7 +15,6 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +-RUMPPATH=/usr/lib + RUMPLIBS=rump rumpuser rumpdev rumpdev_disk rumpdev_pci rumpvfs rumpdev_ahcisata rumpdev_piixide rumpdev_ata + RUMPEXTRA=rumpdev_scsipi + +@@ -38,6 +37,6 @@ target = rumpdisk + OBJS = $(SRCS:.c=.o) + HURDLIBS = machdev ports trivfs shouldbeinlibc iohelp ihash fshelp + LDLIBS += -lpthread -lpciaccess -ldl +-LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=$(RUMPPATH)/lib%_pic.a) -Wl,--no-whole-archive $(RUMPEXTRA:%=$(RUMPPATH)/lib%_pic.a) ++LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=-l%_pic) -Wl,--no-whole-archive $(RUMPEXTRA:%=-l%_pic) + + include ../Makeconf +-- +2.40.1 + diff --git a/gnu/packages/patches/hurd-rumpdisk-no-hd.patch b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch new file mode 100644 index 0000000000..4e5d41917d --- /dev/null +++ b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch @@ -0,0 +1,26 @@ +This avoids rumpdisk crash when booting without "noide". + +Upstream status: Taken from Debian Salsa package git + + https://salsa.debian.org/hurd-team/hurd/-/blob/f40ff84260b5a98bea949013415a1c92c127a43e/debian/patches/rumpdisk-no-hd + +Index: hurd-debian/rumpdisk/block-rump.c +=================================================================== +--- hurd-debian.orig/rumpdisk/block-rump.c ++++ hurd-debian/rumpdisk/block-rump.c +@@ -143,7 +143,6 @@ rumpdisk_device_init (void) + { + device_t device; + +-#if 0 + if (! device_open (device_master, D_READ, "hd0", &device) + || ! device_open (device_master, D_READ, "hd1", &device) + || ! device_open (device_master, D_READ, "hd3", &device) +@@ -154,7 +153,6 @@ rumpdisk_device_init (void) + disabled = 1; + return; + } +-#endif + + if (! device_open (device_master, D_READ, "sd0", &device) + || ! device_open (device_master, D_READ, "sd1", &device) -- 2.40.1 From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 07/11] hurd-boot: Setup pci-arbiter and rumpdisk translators. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 21:01:02 +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.16848756549711 (code B ref 63527); Tue, 23 May 2023 21:01:02 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 21:00:54 +0000 Received: from localhost ([127.0.0.1]:40516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Z7l-0002WY-S7 for submit@debbugs.gnu.org; Tue, 23 May 2023 17:00:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Z7j-0002WM-9s for 63527@debbugs.gnu.org; Tue, 23 May 2023 17:00:53 -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 1q1Z7d-0004Oe-1l; Tue, 23 May 2023 17:00:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=7ybkueHXgVJu1OTSJjpwE4bK/v9+KRlLm5PSRExogZI=; b=V6CEc2dnCJYCt7Qe17pJ zWwL8IjLssMVwuOQjP4gurZsGkCGkwvvcb2AEEfvBU35i95IUrBucZrjQiVhLHpaTgghMQP03USek sOKQcHvdaXl0Pj3F0YMs/P6ooftF/KJ/cqbTJh/Xs2U+C37d+m/lOGV1c7Lxuysd4qIiv1UMu+KnR pEsZfR9wmOtSSK4M3wLDqSea+m4URLMazIbIjXEqlhA9Th1A0qdOhWIlHu8CrJ26KcUIS1b3F2wUD Bm/LGSeRVkmHj5lriz+CpbCN3KPO/Gl/erW7yVjQU+eJXjHCtVYbKtgAL6LDDVAyydPHu7DzYUsf7 tpmxaIl3nFZNng==; Received: from [2a02:a462:da03:1:2701:7f81:a736:4607] (helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1Z7c-00040d-Km; Tue, 23 May 2023 17:00:44 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <80f8fd0cb008971867e8b550535d7e4673d532c7.1684855847.git.janneke@gnu.org> X-Url: http://AvatarAcademy.nl Date: Tue, 23 May 2023 23:00:29 +0200 In-Reply-To: <80f8fd0cb008971867e8b550535d7e4673d532c7.1684855847.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:28 +0200") Message-ID: <87lehe3gr6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: > * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "servers/bus/p= ci. > (set-hurd-device-translators): Create transators for pci-arbiter, rumpdis= k, > and /dev/wd0..4s1..4. Of course, that's rather /dev/wd0..3s1..4. Changed commit message. --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:09:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168491932711613 (code B ref 63527); Wed, 24 May 2023 09:09:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:08:47 +0000 Received: from localhost ([127.0.0.1]:41499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kUB-00031F-56 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:08:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kU9-000312-37 for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:08:45 -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 1q1kU3-0008I8-Br; Wed, 24 May 2023 05:08:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=b+e9dlfxsCIaRyci/9PTYIAu626shsGhpfq0ClQfVYk=; b=fQSSVT5SQZoOcEDlz9uN +/Cd8CnqiaxNEHHZ4Uk8s49fgrUwUAiel9khbeRPPhDNpEoiF91eUbtTMEnJ5MsTWCLPL06IzVVIb vk7FppqgDSfC4zT4dBpfhd5g3CrBJkAjQ6aftOYEeWVUteaolnHCRPOMd2Jl03SWc7DnH3F9zIMpf 2cWSMFP5WVcOmRXlff1Y8zIA5UJIoA0YSKw722CeLQprbHa3C6dSBcGiR9eHGoTZ4a/i0O9EaGb2C EWc1DMDR4TvLgFfafDb4RoZhA9VoN5/C5L1ouSVrxaGJNT9m2s8QzEvaNN92udJPdTz+jUIi2ZSct HUXJnPVTEt3UHQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kU2-00022o-Uf; Wed, 24 May 2023 05:08:39 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Wed, 24 May 2023 11:08:36 +0200 In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:21 +0200") Message-ID: <87bkiaqep7.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Janneke Nieuwenhuizen skribis: > So, with lots of kind help from the folks at #hurd and bug-hurd, and many > thanks to Josselin Poiret for sending their amazing "Add libc specific to= Hurd > and update components" patch set (https://issues.guix.gnu.org/63641, note= that > these series depend on this!) we now have rumpdisk support for the Hurd. Yay!! =F0=9F=8E=89 > To actually use it instead of the gnumach builtin IDE driver, use > > (kernel-arguments '("noide")) Should we build Mach without this driver, or otherwise make =E2=80=9Cnoide= =E2=80=9D the default? (We can answer that later, no rush.) > guix shell qemu -- qemu-system-i386 \ > -m 4096 \ > --enable-kvm \ > --device rtl8139,netdev=3Dnet0 \ Once we have netdde, we can probably drop that line and use the default NIC (e1000, IIRC). Is =E2=80=9C-m 4096=E2=80=9D still needed? You mentioned this as a workaro= und initially, IIRC? Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:12:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168491949311880 (code B ref 63527); Wed, 24 May 2023 09:12:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:11:33 +0000 Received: from localhost ([127.0.0.1]:41505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kWq-00035X-Lc for submit@debbugs.gnu.org; Wed, 24 May 2023 05:11:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kWc-000353-3o for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:11:31 -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 1q1kWW-0000Xz-UC; Wed, 24 May 2023 05:11:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=pg1MA/luT3kAD45e+1i9gaZqiIYaIkC6MpmGp+2rVxM=; b=XjNnCNp2jqRn38BJWxi3 vuAUg7PEV4KqPugxYqakqXkEWtdqa0SWKaX3SGom8MCQrpNulexUKNisx+jdbvujv40e0mAUtHI94 Kyc76mGonJae18tXgYkJA+XHzRSevA6FTNDH3o9bFDM/Qtbfa9VItPg/UU7IbuIhTF3MOcntUke/y b5HmpBcCVwqNnHgbkiBqtfW+FlVv1azAIMtURFK4AkuVvJ+SEhtXCLuegpZZPYdkz6w0t1YAGtxNL S8hA3FIHlXPJcKMKQ5bZA4CXfs8CHgo/RaAxgu0wdPH8OhnKGKgzhdEn6OP/1sK7sajfm4MEslp6O xy+OnDXVVWEXQg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kWW-0002BN-Gr; Wed, 24 May 2023 05:11:12 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Wed, 24 May 2023 11:11:11 +0200 In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:23 +0200") Message-ID: <877csyqekw.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > As suggested by youpi on IRC > > https://logs.guix.gnu.org/hurd/2023-05-17.log#132259 > > libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific pa= tches > while libpciaccess-0.17 works out of the box. > > * gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17. > (netdde)[inputs]: Likewise. [=E2=80=A6] > + ("libpciaccess" ,libpciaccess-0.17) Maybe add =E2=80=9C;need libpciaccess > 0.16=E2=80=9D to convey that we sho= uld be able to safely upgrade next time. Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:14:01 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168491963312110 (code B ref 63527); Wed, 24 May 2023 09:14:01 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:13:53 +0000 Received: from localhost ([127.0.0.1]:41519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kZ7-00039G-CV for submit@debbugs.gnu.org; Wed, 24 May 2023 05:13:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kZ5-000391-9j for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:13:51 -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 1q1kYz-0001Go-N4; Wed, 24 May 2023 05:13:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=s3wVoaKNqTUgGw6YuAtt8XaaIWCFibshm9/rmfUYfzM=; b=cK3QtHBhJJ7JRP5chBOW irzOSNt75av44WUBapMvbo4d8+IFjBCiXyp9h0axM1hxXNd0emYIikFupq0PjGd3Rp/GdTuju58SN dPcwKdKkmwAf4P6v7tqqAppqmAzrM9gtUUvRAEiqT2wCocOhjhdocCVPkBHiHOvfsFEWbURv7O3+v W0EuhwGm3VncjvhJ1M8Vn2E6KlRqUposNbhol58JGM3KKxYjC/ulm5O+XL2Hs4lmPYstsyS/cwpHl cmCFyqMZs4MVpHaBHOv7X1H4IFtyHpuHhJAc69t8+tc78UjqiWl/VYOmLOMGfDltNXUxWwjkX9yCG e9d1S1idWi+c8A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kYz-0002aX-9r; Wed, 24 May 2023 05:13:45 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <71a14f2a5b28b90b2a996b1afab6e39c101dfa1d.1684855847.git.janneke@gnu.org> Date: Wed, 24 May 2023 11:13:43 +0200 In-Reply-To: <71a14f2a5b28b90b2a996b1afab6e39c101dfa1d.1684855847.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:26 +0200") Message-ID: <871qj6qego.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > * gnu/packages/disk.scm (parted)[inputs]: Remove lvm2, add hurd-shouldbei= nlibc > when building for the Hurd. > [arguments]: Add configure-flag '--disable-device-mapper' when building f= or > the Hurd. [...] > (arguments > - (list #:phases > + (append > + (if (hurd-target?) > + '(#:configure-flags '("--disable-device-mapper")) > + '()) > + (list > + #:phases Slightly more visually appealing: (list #:configure-flags (if (hurd-target?) #~'("--disable-device-mapper") #~'()) #:phases =E2=80=A6) :-) Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:17:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168491977112392 (code B ref 63527); Wed, 24 May 2023 09:17:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:16:11 +0000 Received: from localhost ([127.0.0.1]:41533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kbL-0003Do-95 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:16:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kbJ-0003Da-17 for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:16:09 -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 1q1kbD-00026I-4O; Wed, 24 May 2023 05:16:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=DEGrQILK8d36M/SrDh3wK3sgoiCw5tOBEYaqz6//yg0=; b=EPfhlIV5J1nSOavXJris vbz4lRuHSr8ujIVm1kcHk3NT6/mO1olsKtvGrM+jc43MY34hgnOaMFCOzh6Gi53/Di3lZGqDKbU2j aReNifqzyWRbtQFp/wx0aGbsQaPuvME85bx51xYMZPkOKuuZnQ8XhMDO8XpchkrIVjpi3Q9nJYgTd hbxxW8oOUloi7JqdMNl1825CdYXZX7wBAcwAYuls3lXr71nLNynnzrS2pFFYqe3jonVZBqavIEEAT DgtpO91XdT3Cz4+A9/jFSa61LgVTfkvcrLUnjYT81GsHMfLK4vojWescHawOGCseIQLip4AY4296J Z6sxh7ZxP1Pr3Q==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kbC-0002rx-N8; Wed, 24 May 2023 05:16:02 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87bkiaqep7.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:15:57 +0200 In-Reply-To: <87bkiaqep7.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:08:36 +0200") Message-ID: <87o7maytrm.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: Hi Ludo! > Janneke Nieuwenhuizen skribis: > >> So, with lots of kind help from the folks at #hurd and bug-hurd, and many >> thanks to Josselin Poiret for sending their amazing "Add libc specific t= o Hurd >> and update components" patch set (https://issues.guix.gnu.org/63641, not= e that >> these series depend on this!) we now have rumpdisk support for the Hurd. > > Yay!! =F0=9F=8E=89 Yes \o/ >> To actually use it instead of the gnumach builtin IDE driver, use >> >> (kernel-arguments '("noide")) > > Should we build Mach without this driver, or otherwise make =E2=80=9Cnoid= e=E2=80=9D the > default? (We can answer that later, no rush.) Possibly, I would suggest for now to follow upstream, IIUC, rumpdisk is still somewhat experimental (and slooowww). I expect upstream/bothstream to drop the "noide" patch at some point, and possibly eradicate the IDE driver from gnumach altogether? >> guix shell qemu -- qemu-system-i386 \ >> -m 4096 \ >> --enable-kvm \ >> --device rtl8139,netdev=3Dnet0 \ > > Once we have netdde, we can probably drop that line and use the default > NIC (e1000, IIRC). > > Is =E2=80=9C-m 4096=E2=80=9D still needed? You mentioned this as a worka= round > initially, IIRC? -m 2048 should be enoug, it seems boot with -m 1200; but yea, we do _do_ need more than 1024 (or 512 even)... Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:17:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168491980712446 (code B ref 63527); Wed, 24 May 2023 09:17:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:16:47 +0000 Received: from localhost ([127.0.0.1]:41537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kbu-0003Ef-Pm for submit@debbugs.gnu.org; Wed, 24 May 2023 05:16:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kbt-0003ET-JN for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:16:45 -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 1q1kbo-0002J2-D9; Wed, 24 May 2023 05:16:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=6yJ0ZQs7WgAJ4eZRyp1Gf0Vk8zFXVLORJjP/TjnvGvY=; b=feDlnOpuQoSxknrMRpAd fIVlDMfvjJ5/ToqCdoOz7GMYslrLw/nQRdJKk7h6W/ArlsvggdNci/B1zSztqMumLMglKaC7LoSb+ 2+SVttF8OlOruMATv/+625W6+wgAN8/vSzenY6rSp9JTChblGbHV073Fs/DfHYD1WPPW5pJGXcWTt w273lEKL8gw4Pu9qXmRKNTF/384s+joZru6goi+OQ3wF8795sM//QmKQ39U2Zg5jEm5EgUNECwgf6 Pd1RGOWJA7Fj5uK727jW7rLp/g3foQ+6KC7kva9e9zAi/qy7PE6LOIKKVYHEsaS/7rizdgCxeYqKS eN2ZMnFWc0e6fw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kbo-0002t0-0A; Wed, 24 May 2023 05:16:40 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <80f8fd0cb008971867e8b550535d7e4673d532c7.1684855847.git.janneke@gnu.org> Date: Wed, 24 May 2023 11:16:38 +0200 In-Reply-To: <80f8fd0cb008971867e8b550535d7e4673d532c7.1684855847.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:28 +0200") Message-ID: <87wn0yozrd.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "servers/bus/p= ci. > (set-hurd-device-translators): Create transators for pci-arbiter, rumpdis= k, > and /dev/wd0..4s1..4. [...] > + ,@(append-map (lambda (n) > + (let* ((n (number->string n)) > + (drive (string-append "dev/wd" n)) > + (disk (string-append "@/dev/disk:wd" n))) > + `((,drive ("/hurd/storeio" ,disk) #o600) > + ,@(map (lambda (p) > + (let ((p (number->string p))) > + `(,(string-append drive "s" p) > + ("/hurd/storeio" > + "--store-type=3Dtyped" > + ,(string-append > + "part:" p ":device:@/dev/disk:= wd0")) Shouldn=E2=80=99t =E2=80=9C/dev/disk:wd0=E2=80=9D be =E2=80=9C,disk=E2=80= =9D instead? From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:25:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492028613559 (code B ref 63527); Wed, 24 May 2023 09:25:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:24:46 +0000 Received: from localhost ([127.0.0.1]:41546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kjd-0003Wc-Ni for submit@debbugs.gnu.org; Wed, 24 May 2023 05:24:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kjb-0003WD-4T for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:24:44 -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 1q1kjU-00047f-MT; Wed, 24 May 2023 05:24:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=PDgUqGQ+iYw8JOzb9A/5FNywt0UkeSnoq361HqHky8c=; b=AhSaiFn8M8jEv+IdtAfw HTcO/acv37pyaXePx6ouHCqVCWMPBPT5uhJHmNRjUPsaukUmQmz8F9NI5XxoYLQwCK0WHsEBXp/ne C4kxRfBgtPoxfyRaeUgREwcIvZM2zhVwe8QK+AsXP7fS7mW1Oty6SWEibPPGqlTTli6bRmkRKYKLQ YuQokuZt3MfXNnKXsVIyanMilqIsNubfwQm/m3/b76Kwfvk2kcb9KNtZzLFrGJIig4f+VM9lIh18A VF4G5exF6bWgGed4hKPqSNmYXUPMU6QM/elBIq6F9lp4lbYH+8UFY37uWFXF6wS6MFQTXkJhuzXWW cnsz7+cnbroWVw==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kjR-0003Xb-5P; Wed, 24 May 2023 05:24:36 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <71a14f2a5b28b90b2a996b1afab6e39c101dfa1d.1684855847.git.janneke@gnu.org> <871qj6qego.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:24:30 +0200 In-Reply-To: <871qj6qego.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:13:43 +0200") Message-ID: <87fs7mytdd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > [..] > Slightly more visually appealing: > > (list #:configure-flags (if (hurd-target?) > #~'("--disable-device-mapper") > #~'()) > #:phases =E2=80=A6) > > :-) Nice I couldn't figure this one out, thanks! Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:29:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492053614355 (code B ref 63527); Wed, 24 May 2023 09:29:01 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:28:56 +0000 Received: from localhost ([127.0.0.1]:41560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1knf-0003jT-Sc for submit@debbugs.gnu.org; Wed, 24 May 2023 05:28:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1knd-0003j4-Tw for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:28:54 -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 1q1knY-00057k-JH; Wed, 24 May 2023 05:28:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=UteHu2pwM0T+NawGq0Yc3JRGPmHlDonWvJ2doGSx900=; b=lijqMV2DJvrohnhbuzWB VOOQN4plpys2dHUYYIhaZjQ+VMj/36YNWAeV5Zpv9X4fo2esGRcV/c5bptSnPTiFN9BMuHEgMaIRt Mr96B15QKm9C2R2wTcFbTWosY2N2FHC6R8hdCsUIjKGOgTVcq+T8Q+QkctytVZC2V7Wi0Ctt4hKdb Y+vUhTsu6bi/krFYQwsce1ZkLl9TY0jQdVCsJCOqrI1V/cJQXu394mQjZcbZrBESTLpoPme0F8n01 kTm2ivpThxsh3wsXUJ0+qDLQFIiqhGYK0xR7IsWP5/m9SlBnB4HPYwawze1ZntKJ9JyIL8gx7ioIu AQO3SaRqq0+3jg==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1knW-00083g-2C; Wed, 24 May 2023 05:28:47 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <877csyqekw.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:28:44 +0200 In-Reply-To: <877csyqekw.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:11:11 +0200") Message-ID: <87a5xuyt6b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> As suggested by youpi on IRC >> >> https://logs.guix.gnu.org/hurd/2023-05-17.log#132259 >> >> libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific p= atches >> while libpciaccess-0.17 works out of the box. >> >> * gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17. >> (netdde)[inputs]: Likewise. > > [=E2=80=A6] > >> + ("libpciaccess" ,libpciaccess-0.17) > > Maybe add =E2=80=9C;need libpciaccess > 0.16=E2=80=9D to convey that we s= hould be able > to safely upgrade next time. Nice, yes that's helpful. Done. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:32:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492066214752 (code B ref 63527); Wed, 24 May 2023 09:32:01 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:31:02 +0000 Received: from localhost ([127.0.0.1]:41569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kpi-0003ps-C1 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:31:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kpg-0003pN-5b for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:31:00 -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 1q1kpa-0005Zq-BI; Wed, 24 May 2023 05:30:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=gchekBmbuevUMgrE2G96lae52eQ9UA+wzY7gVxaGT4o=; b=d4q377+0EpSuY17euBhU T66pM6TUTGmHQPEv3Z673Mwcc6fHuJuiKSbe40VEE1pfjA7VKG1nQhV4/1viIbCiw93YRqsk/YatZ wVYrWhECkLPA51d2XnQJ+Ahb6OO8ftQScpmifUX8oqcQFdmtpNneSjdxbsNX947f1x4xWtnLGyIsb JECeqgUjRU6z7VYLowZ5cQhCoPFL0+/FRKBDkYo5NXGcZ33M15HePhU2ysyfgXuuZPvRPXn/xGEAY GENZ4i5VWUR8wXwGgA8WGv9S72Cz9ZxDBFaZjmhSV/DQSCXN3hLJuXwvUxXZSDGZlc6eQZ++k1x4J 1lkuoy2tfljEjg==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kpV-0004vG-NG; Wed, 24 May 2023 05:30:52 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <80f8fd0cb008971867e8b550535d7e4673d532c7.1684855847.git.janneke@gnu.org> <87wn0yozrd.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:30:48 +0200 In-Reply-To: <87wn0yozrd.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:16:38 +0200") Message-ID: <877csyyt2v.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "servers/bus/= pci. >> (set-hurd-device-translators): Create transators for pci-arbiter, rumpdi= sk, >> and /dev/wd0..4s1..4. > > [...] > >> + ,@(append-map (lambda (n) >> + (let* ((n (number->string n)) >> + (drive (string-append "dev/wd" n)) >> + (disk (string-append "@/dev/disk:wd" n))) >> + `((,drive ("/hurd/storeio" ,disk) #o600) >> + ,@(map (lambda (p) >> + (let ((p (number->string p))) >> + `(,(string-append drive "s" p) >> + ("/hurd/storeio" >> + "--store-type=3Dtyped" >> + ,(string-append >> + "part:" p ":device:@/dev/disk= :wd0")) > > Shouldn=E2=80=99t =E2=80=9C/dev/disk:wd0=E2=80=9D be =E2=80=9C,disk=E2=80= =9D instead? Oops, yeah sure! This could have been quite a search bug search one day... Changed to ,@(append-map (lambda (n) (let* ((n (number->string n)) (drive (string-append "dev/wd" n)) (disk (string-append "@/dev/disk:wd" n))) `((,drive ("/hurd/storeio" ,disk) #o600) ,@(map (lambda (p) (let ((p (number->string p))) `(,(string-append drive "s" p) ("/hurd/storeio" "--store-type=3Dtyped" ,(string-append "part:" p ":device:" disk)) #o660))) (iota 4 1))))) (iota 4 0)) Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:33:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492076814900 (code B ref 63527); Wed, 24 May 2023 09:33:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:32:48 +0000 Received: from localhost ([127.0.0.1]:41575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1krP-0003sG-Te for submit@debbugs.gnu.org; Wed, 24 May 2023 05:32:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1krN-0003s3-R7 for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:32:46 -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 1q1krI-0005qG-0S; Wed, 24 May 2023 05:32:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=eBg35mbbNSCCQJPZfDJH6MMiDYTLh7vLqxUjB8hdk/Q=; b=AB7kg+77aTSNeVkkkQhW BgwSByZWy0Ox4bGQSZliI9AZZZZ1vkBeHxmiocpzbPO+m4+9br8FUAPnfKCuo4zWyoT3uNNbWo1jc GOzo5e8e1MU/o8ZyOubYxKDjMsthy/3sgrxXelI81PnZRLCDqTMxqxkR9rKj56EVSBjD9P6d+4vmF Evm8BifY+efUDqd3n9fx2CrJ1wIl+bNBMMwJXJY43RdaSqfJBXG66j0W+dcVizTnXMaHTceZUnW9y V0JZZdN8CFr5wHto5hDOAGQd2jm+P2WFYOR3TtQe9wDsDFzojXM3EAPc+cC3xvACD6IQf34OVG0KC d1ky3dDjbdh6+Q==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1krF-0000H3-Cs; Wed, 24 May 2023 05:32:39 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Wed, 24 May 2023 11:32:35 +0200 In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:31 +0200") Message-ID: <87pm6qoz0s.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > * gnu/bootloader/grub.scm (make-grub-configuration): When "noide" is in > arguments, use device name "wd0" rather than "hd0". [...] > + (let* ((kernel (menu-entry-multiboot-kernel entry)) > + (arguments (menu-entry-multiboot-arguments entry)) > + (disk (if (member "noide" arguments) "w" "h")) Could you add a comment like: ;; Choose between device names as understood by Mach's built-in IDE ;; driver and those understood by rumpdisk (in the "noide" case). (It=E2=80=99s a bit of an abstraction leak, but hey, we=E2=80=99ll worry ab= out it when we have another multiboot-compliant kernel.) Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:37:02 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492102115298 (code B ref 63527); Wed, 24 May 2023 09:37:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:37:01 +0000 Received: from localhost ([127.0.0.1]:41592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kvV-0003yg-F0 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:37:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kvT-0003yU-6q for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:37:00 -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 1q1kvN-0006eN-Qy; Wed, 24 May 2023 05:36:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=WzSWNN7ldkrVrwIMrwNKdgtZNIvEHgAYegF0iwUW4o0=; b=rqajQqlSZQGd/yHD6War sPjWV9Mh/rhF1ep14SBPGerr3oicVb6edStfLZtu47hAgkMruksVwldP37trbkOxMVlfkfgV6305f VinTjTPVZtZCW0AZtJPuuRwgm4btdXOQJeGtQh81s0bSUKK82cZoHPNLAGx+A82XE/QbPyzSKxiXo stKoAS/pL2uMmR53ALCwmL8opJCItY2HZME1Rx/gTbDA51URs6ziuOn90d6lnMqDUiPpjJOIzL/QP mk//hwLF0FXew8MYuVAT7u3qqMiQbMg9T+U+cNWtCD0hNNfRQOJg3BBU3H2nXlv0GlUfMIbDTgqgy Ct+zyj9yfsglqQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kvN-0008V3-EE; Wed, 24 May 2023 05:36:53 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <82af884b2c75d17e8548854300458e49fda8a755.1684855847.git.janneke@gnu.org> Date: Wed, 24 May 2023 11:36:51 +0200 In-Reply-To: <82af884b2c75d17e8548854300458e49fda8a755.1684855847.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:32 +0200") Message-ID: <87ilcioyto.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > * 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. [...] > +@lisp > +'("console=3Dcom0"") ^ Extra quote. > +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: Nitpick: 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: Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:38:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492106915388 (code B ref 63527); Wed, 24 May 2023 09:38:01 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:37:49 +0000 Received: from localhost ([127.0.0.1]:41597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kwG-000408-R4 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:37:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kwE-0003zs-Gt for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:37: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 1q1kw8-0006jP-8h; Wed, 24 May 2023 05:37:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=QUD8itLOzoPJwT09tR+bANPTUvrATHXk+GDKg8nOXm0=; b=oXmDEf1/2jNQwwsIki66 bYbhXTS9F7IUTwSC2f/DXap8K6Lr8Fzo01ldCZ3GbttVOg0h/CijXQFXyagIG9mFfnwV+F91FaDG8 VS0z1NPaTNFB3yLQu5atcSQlHq0LJ5DcifqxHgINywd3hO2G2E7LGkZIdJhRsqWuy/1rIr53a2HHy n01DKF9agGPJM+prtPelA0PyBjIs+/1eVxfvCmGM3exuIgjJ0BF6SZ0uz2I4Hn8/4hR9/acgMbJ4P SUhOkSNWdLVWcFi4Uqb8YB/UgkkkDa5JQ+h1of+5bn7UOUIuG/s67H+QmUExfaNyvfeJqi77733TS y9GjGb5g+kXrcw==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kw7-00005Z-Op; Wed, 24 May 2023 05:37:40 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87pm6qoz0s.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:37:36 +0200 In-Reply-To: <87pm6qoz0s.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:32:35 +0200") Message-ID: <87353mysrj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> * gnu/bootloader/grub.scm (make-grub-configuration): When "noide" is in >> arguments, use device name "wd0" rather than "hd0". > > [...] > >> + (let* ((kernel (menu-entry-multiboot-kernel entry)) >> + (arguments (menu-entry-multiboot-arguments entry)) >> + (disk (if (member "noide" arguments) "w" "h")) > > Could you add a comment like: > > ;; Choose between device names as understood by Mach's built-in IDE > ;; driver and those understood by rumpdisk (in the "noide" case). Added as ;; Choose between device names as understood by Mach's built= -in ;; IDE driver ("hdX") and those understood by rumpdisk ("wdX" ;; in the "noide" case). (disk (if (member "noide" arguments) "w" "h")) > (It=E2=80=99s a bit of an abstraction leak, but hey, we=E2=80=99ll worry = about it when > we have another multiboot-compliant kernel.) (Yeah, ok!) --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:39:01 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492108415443 (code B ref 63527); Wed, 24 May 2023 09:39:01 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:38:04 +0000 Received: from localhost ([127.0.0.1]:41602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kwW-000411-71 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:38:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kwU-00040N-Py for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:38:03 -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 1q1kwP-0006mX-Iw; Wed, 24 May 2023 05:37:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=G19FhEHhM4C0jNq5QUsAyowrwAUm3R6DjMa7dL8pAa4=; b=B4rYnZrpTllCyRBIIXea uyeoZJ2r/vAjRyGDlJzSq14WXhXehiDXZLXXBvLo8MPmuszN6PeBWzLTgFTMm+Ot8ek88BJYDRd93 hXewLK4nhRURoysGQLLyC/qUk6occZ7RgjPLV0TFWIsZaB5lftpjQpoXgm8C/J+kcq3AFY9H28uzt ExhktYEn8wBL/ZpWj/UYuzsSR++CyspHN43c4kBHTsfEArpE3k9DVA9ya9E+IB0+h8rszsDeFoM+3 hiFj9PRjYs3I7VY6jxquN8bzJTLI30LpSV0t+3DuvUxilP+ZUJ6fXbA8Qg1C2xFjhNIjbNv2Ta+v3 tikfp1ZHo2uhHA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kwP-00009A-5v; Wed, 24 May 2023 05:37:57 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Wed, 24 May 2023 11:37:55 +0200 In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 23 May 2023 17:47:21 +0200") Message-ID: <87cz2qoyrw.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) I made cosmetic suggestions (as I usually do :-)) but the whole patch series looks great to me, thank you! Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:41:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492124115688 (code B ref 63527); Wed, 24 May 2023 09:41:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:40:41 +0000 Received: from localhost ([127.0.0.1]:41620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kz2-00044y-M3 for submit@debbugs.gnu.org; Wed, 24 May 2023 05:40:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1kz0-00044k-LY for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:40:39 -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 1q1kyv-0007RY-FO; Wed, 24 May 2023 05:40:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=rE+QTrHDhoI4eXKRMDHDWHQIw37riyUG1m8BmKTtDNU=; b=qla05TVUxpw+8/LeT1m8 XQOCxZKmclvfT8N1kKNtPl0v9O/617sACHNqM2W6M88GVuXWsCu0v3BozOUwyoPM22O5R3FqdXa2c tM/+DAWo3W7F7a12EXuOKy1ZvQ9NOhbSEVnR45Q09VkhE6qrxVER90cKXEMYIYvNiFkZL0qcs2Vn6 KrzeisxdRJJfbB3cxNasVKRTZ5l9OUJm2vp1ZSKBktKiz6ovBWpykrmnX2fBHViAqqO95rDJL6tf4 k9fi8BM6HF3gezyR13cd6qGBB/zFc3HUqEhx4WkKkp2BZOspNZeUTw43NjWavZe7br7j/JtzXUhO2 vXJomdvqZxpbuw==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1kyr-0000T1-M2; Wed, 24 May 2023 05:40:33 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <82af884b2c75d17e8548854300458e49fda8a755.1684855847.git.janneke@gnu.org> <87ilcioyto.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:40:27 +0200 In-Reply-To: <87ilcioyto.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:36:51 +0200") Message-ID: <87y1lexe2c.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> * 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. > > [...] > >> +@lisp >> +'("console=3Dcom0"") > ^ > Extra quote. Oops. >> +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: > > Nitpick: > > 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: I like it! Thanks. --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 09:47:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168492160416253 (code B ref 63527); Wed, 24 May 2023 09:47:02 +0000 Received: (at 63527) by debbugs.gnu.org; 24 May 2023 09:46:44 +0000 Received: from localhost ([127.0.0.1]:41735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1l4u-0004E5-Ip for submit@debbugs.gnu.org; Wed, 24 May 2023 05:46:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1l4t-0004Dt-7m for 63527@debbugs.gnu.org; Wed, 24 May 2023 05:46:43 -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 1q1l4n-0000I8-HM; Wed, 24 May 2023 05:46:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=SSK6mNtSYJjccIVURaWcU4kkC/fO4Js9mRhS7oBw+0I=; b=JYZAWXE2+RRvQWj3lRzY E5fR7sU0XGdjaCMqZ/fQk0Nm1MiDW/aLA4s3sVjtY2UBbpyENfmyO+r8YOCSqUWZwFxK6Ex5LUiyp 2NlAA7QpwAYoLvwcfMYRIZcCuz2SRm5aJBUsSs+OzNSw7I9pjJCRzavvjSRnErVCdfeYRYXNR+sH3 NfEwm7Xo4WbM2KE4PfGo0ZSrx9oJ8tldatYN/xpd11WuMTCIOUFYRWvW4sQgIAlVRRf8RYBj1CGjw M+shcc6QGYE99Zqj0AET2pllyuWZcui0kdigQF5DW0Sc7vssMGWybOvU0doarq4qIPdnaxnqjhLlI 1aqW7dSMAlScvg==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1l4n-00014l-4A; Wed, 24 May 2023 05:46:37 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87cz2qoyrw.fsf_-_@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 24 May 2023 11:46:35 +0200 In-Reply-To: <87cz2qoyrw.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 24 May 2023 11:37:55 +0200") Message-ID: <87ttw2xds4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > I made cosmetic suggestions (as I usually do :-)) Yes, and spotted typos/buglets), so thank you for all that! > but the whole patch > series looks great to me, thank you! \o/ So, good to go after https://issues.guix.gnu.org/63641 merges! --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jul 2023 17:14:02 +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: Janneke Nieuwenhuizen , Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168926842024361 (code B ref 63527); Thu, 13 Jul 2023 17:14:02 +0000 Received: (at 63527) by debbugs.gnu.org; 13 Jul 2023 17:13:40 +0000 Received: from localhost ([127.0.0.1]:40726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJzsp-0006Kr-TI for submit@debbugs.gnu.org; Thu, 13 Jul 2023 13:13:40 -0400 Received: from jpoiret.xyz ([206.189.101.64]:51410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJzso-0006Kj-40 for 63527@debbugs.gnu.org; Thu, 13 Jul 2023 13:13:38 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 8F7C618519E; Thu, 13 Jul 2023 17:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1689268416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=il4oVlIREICKOp/Jcw+Q8qFkoGFXnFikJZK8RM9nAcU=; b=qzWgXtcqq4Qke57pa951ewJ82PdUsUtraL/fwbmDtcZj6d8C6gWG+d+uTfhuv3of8lZv1O 5mpMpv+4sZCjn1jPwsiI9OgfBTEiflWJlUzxBoK/CE905+wMAUNveIEmuvCxVMmA9z91Oo hym0ogJhM08BEX4DrdRsF7+7fcH4NO3IrejAkCU+JKh8d0RaSXtJbjK5UQE5+kJcf8D6I0 ZEb00LqqywVJIGcLyLf4XQfNwEQTVJhcLmymL4NRVLaVKOpwUKc+FeA1/ct8cDzqiLeTft 1ng9/pNR3UI1QoOxtvm8OefPWm97tn0yC6KdITJ9DDnMXJJB48yvqlUB3lWzFA== From: Josselin Poiret In-Reply-To: <87ttw2xds4.fsf@gnu.org> References: <87cz2qoyrw.fsf_-_@gnu.org> <87ttw2xds4.fsf@gnu.org> Date: Thu, 13 Jul 2023 19:13:34 +0200 Message-ID: <87bkgf91kx.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Janneke, Janneke Nieuwenhuizen writes: > So, good to go after https://issues.guix.gnu.org/63641 merges! Finally got around to review and merge this + netdde as b4fe82bd8af735000d0f2165a23cfb695c181f6f. Sorry for the delay, and thanks for this amazing packaging! Best, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmSwML4QHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaiktyC/97QE4jrP7Q1IdSNosu58WyK3/dfyzd4jCz dQLxLVSEqOeDGFe2n80fvfrzCGFQfsz9FC4GZJn/rgs+L7tHvDKaOFBLmIQvZTe4 O1Tkt6vGXGJcPSoUYhW/hkA6AYprmSkl7y1NETT69fnDTDAkkp1uMn/PzlZPYVsO ftnBIwlZFy3M2+UyscTOmsttyfsfZCMmzC/NjcllCZEZVvZwARiiKPjSQmsGeVlV 8f90yBiQT9Z4C07ly3LwSvQ+ddOiRsetkbwwVCX4WgeBulcHGORLJWD2pybHFtWN lCpmPaa/CBbJfqMaBOrQV9zQaDl/yfHznA77caTGl2HVEvzOUwUxWFuuRYbJK77T Jfj8L9A7XR4nrsmRmMCMM5hb0nVKMh4KNIGC+BrhZtg2C/ziP2uMLnH3LJiuAH6H OBpeD7h+g8Nvj3OqZ9HGbRGeBAB/zEYb450ECZ8QXyTkeTm8llEpsz5goiC7Zr8e jQJ2DRJuEeguOOD8iLkKFceQZlTkkr0= =3+aB -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 13 13:16:11 2023 Received: (at control) by debbugs.gnu.org; 13 Jul 2023 17:16:11 +0000 Received: from localhost ([127.0.0.1]:40749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJzvG-0006Qb-V0 for submit@debbugs.gnu.org; Thu, 13 Jul 2023 13:16:11 -0400 Received: from jpoiret.xyz ([206.189.101.64]:52098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJzvF-0006QT-Ks for control@debbugs.gnu.org; Thu, 13 Jul 2023 13:16:10 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 283611851DD for ; Thu, 13 Jul 2023 17:16:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1689268569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fxDGsFQ+HOcnRMQF8VbvZcizGeYsQG4/IhHseZCBe/Q=; b=vr9yU0Sr39c/5+cY8dhwHk7ULsRLnCqmOTgq7Y9hbXt8YUi4kVD8HcMRTQp9ITvUSi0gY5 xjNEQpIgZuDGnGODqBYsMLMfr9XRXaDpzQ+tVzvob2YvDYjZPuNi125usMCUD1pvs3mnKg TOuf9XMx6/p+ccXzRvKomY24w1NazWW/ArTOs6+XcwfKcgAYQqlJKB31iatswg0cTkD8zD PEn6d1oIKWzyf7uw9h/awHmOK69rRcvz+zRfK1YYtKp9DKHTBEUnPQg1BnXvjDyqW/UnHE uO3Ld9I3EDNYoKOUH4R+W/Wi80RUmssLGNjybTPqHMnVYdKuyX2zUMWWawud8w== From: Josselin Poiret To: control@debbugs.gnu.org Subject: Re: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. In-Reply-To: <87bkgf91kx.fsf@jpoiret.xyz> References: <87cz2qoyrw.fsf_-_@gnu.org> <87ttw2xds4.fsf@gnu.org> <87bkgf91kx.fsf@jpoiret.xyz> Date: Thu, 13 Jul 2023 19:16:06 +0200 Message-ID: <87351r91gp.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable close 63527 thankyou =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmSwMVcQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaiqPLDACHWumZ11Z1v0RBY5sGhZjtlBspX/b/T7iP CUDraHOb3vKRnVZJcpVNuj14pgyXKwiyf0xDZMEryFJTnBtq4UJrJS26A4xHSNHm vLYHucFJB6r14Fl/Bi4p+wAprrF71tmWcj6H1Pt5l1qRmhhcZYtHuZF6Fhwj2MJQ xeyclCw98JV5wViitYdzMEjRLj9c4KF+k9/a1nTyikXU0Wya1JkNbFbyX35z/3kv fvEYvIFg2ps1+bVXSVUzyBwSolJivVbx2/E24HSb+c98LNW2xuUwNKE0erdFxpkb vf8mKq28xlvvhMvApp/ze8oqkY5C8B4s5bBnbbpccQ8C9mcOu6fM85GG51eNU2kv /ndUr1lN5Mb0pVxsmV3ZDT99dATflemN94818BTBma6UbLmvQwgOnN6ot/a/33+T r4lfboyaRKKkfKBi+4T76kOzplpGAcB7boyDDrRhU4vRDkk4vpmfv3sPcOz/Bjui zTSIxlWf6PK6YnMaRhxzhtjGh4ZmvCM= =pSCX -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jul 2023 17:42:02 +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: Josselin Poiret Cc: 63527@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16892701004674 (code B ref 63527); Thu, 13 Jul 2023 17:42:02 +0000 Received: (at 63527) by debbugs.gnu.org; 13 Jul 2023 17:41:40 +0000 Received: from localhost ([127.0.0.1]:40785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qK0Jt-0001DG-Dt for submit@debbugs.gnu.org; Thu, 13 Jul 2023 13:41:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qK0Jn-0001Cz-Qx for 63527@debbugs.gnu.org; Thu, 13 Jul 2023 13:41:35 -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 1qK0Jg-0007nG-II; Thu, 13 Jul 2023 13:41:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Iv+eCzl8kfRyGjBZ9dN4Rh8XCBlQZPdfeqfdcQHukqQ=; b=ckLtI6IyggcMtishMTde ONZALhsiSAYEEdO3jd+AH2+7vAZEHylZviSZV5er7ITb00Dq+5wHSkmq9SZn1Ow1otVUuRJ6+rlpc FSV+Wl7lk8k3CpVvcIXxY8b602/NA3OvcmHuxVkgnI8UFR3W/Flv0p8GH831Lo+6p8J0YQtbrmOJq Z+3lh7+ju6tC7ah01UK0IsppfSfZPk7oJ6RZifeAZDrIH8L24SvHhhlUvK+YJ+zaKV6DwRFu4mysF 3MIJlV6wrMulTDFFfozxVxAkZZ6XnhkBzVVB/4qUnIHitoVBFDkiiMGXs8eF5wgIaXTw2Uu/JRbSs gVIYafXRJvtMXg==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qK0Jg-0001zt-5n; Thu, 13 Jul 2023 13:41:24 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87cz2qoyrw.fsf_-_@gnu.org> <87ttw2xds4.fsf@gnu.org> <87bkgf91kx.fsf@jpoiret.xyz> X-Url: http://AvatarAcademy.nl Date: Thu, 13 Jul 2023 19:41:19 +0200 In-Reply-To: <87bkgf91kx.fsf@jpoiret.xyz> (Josselin Poiret's message of "Thu, 13 Jul 2023 19:13:34 +0200") Message-ID: <874jm7hfpc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Josselin Poiret writes: Hi hurd-team ;) > Janneke Nieuwenhuizen writes: > >> So, good to go after https://issues.guix.gnu.org/63641 merges! > > Finally got around to review and merge this + netdde as > b4fe82bd8af735000d0f2165a23cfb695c181f6f. Sorry for the delay, and > thanks for this amazing packaging! Thanks for your extensive review with patches! Does anything have to happen for ci to pick this up? It seems awfully quiet here https://ci.guix.gnu.org/search?query=3Dsystem%3Ai586-gnu It would be nice to have hurd-team rebased, and added to ci too, but we'll probably want to wait until i568-gnu on master is built. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jul 2023 13:38:01 +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: Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org, Josselin Poiret Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16893418803885 (code B ref 63527); Fri, 14 Jul 2023 13:38:01 +0000 Received: (at 63527) by debbugs.gnu.org; 14 Jul 2023 13:38:00 +0000 Received: from localhost ([127.0.0.1]:41730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKIzf-00010a-HW for submit@debbugs.gnu.org; Fri, 14 Jul 2023 09:38:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKIzd-0000zt-4u for 63527@debbugs.gnu.org; Fri, 14 Jul 2023 09:37:58 -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 1qKIzX-0004UV-IC; Fri, 14 Jul 2023 09:37:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=I0CiMpj9/BUkHDEdaXLtKCx2m/jhQXt9GWsKVelDDjE=; b=kkobU5lUTYlVFqBLq0C6 0QusG4kCtb0NQ1ePsegkQ81gMCg6Jz7/ZYe7pCdnY3882Btv/9mQ9zxLZLy1JAEeRRq+/irUKBz8+ 9ISPnuPefNoumV1PLOrN/3raN089s/lblK55zHEUxlip7qqSNQsqzqiYYKaVL2gMxyfpcUkhOPds2 eC0D3cWxqvh8rdVTshUPhExYfA8zlAeIj4uBk/HS8OWJriUS2kbCx/CN0CgjW1PByEmLdmLBzYoVd sCKjk6ah2XoGs0KJiFisMj0mjIDmy0dwtP+P2pOPO3WOfQyuObahnVNx4FRd4aHBdEUPpHTFrsBiR nBb5xWgSOqUhfQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKIzX-0006j3-5m; Fri, 14 Jul 2023 09:37:51 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87cz2qoyrw.fsf_-_@gnu.org> <87ttw2xds4.fsf@gnu.org> <87bkgf91kx.fsf@jpoiret.xyz> <874jm7hfpc.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 26 Messidor an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour de la Sauge X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 14 Jul 2023 15:37:48 +0200 In-Reply-To: <874jm7hfpc.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Thu, 13 Jul 2023 19:41:19 +0200") Message-ID: <87bkgewr4j.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello fantastic hackers! :-) Janneke Nieuwenhuizen skribis: >> Janneke Nieuwenhuizen writes: >> >>> So, good to go after https://issues.guix.gnu.org/63641 merges! >> >> Finally got around to review and merge this + netdde as >> b4fe82bd8af735000d0f2165a23cfb695c181f6f. Sorry for the delay, and >> thanks for this amazing packaging! > > Thanks for your extensive review with patches! Yeah, thanks to the two of you!! > Does anything have to happen for ci to pick this up? It seems > awfully quiet here > > https://ci.guix.gnu.org/search?query=3Dsystem%3Ai586-gnu It was apparently picked up: https://ci.guix.gnu.org/eval/595625 However, there seem to be regressions when cross-compiling to i586-pc-gnu, such as : --8<---------------cut here---------------start------------->8--- gcc dlopenold.c -c -std=3Dgnu11 -fgnu89-inline -g -O2 -Wall -Wwrite-string= s -Wundef -Werror -fmerge-all-constants -frounding-math -fno-stack-protecto= r -fno-common -Wstrict-prototypes -Wold-style-definition -fmath-errno -f= PIC -ftls-model=3Dinitial-exec -I../include -I/tmp/guix-build-glibc-= 2.35.drv-0/build/dlfcn -I/tmp/guix-build-glibc-2.35.drv-0/build -I../sysd= eps/unix/sysv/linux/x86_64/64 -I../sysdeps/unix/sysv/linux/x86_64 -I../sy= sdeps/unix/sysv/linux/x86/include -I../sysdeps/unix/sysv/linux/x86 -I../sy= sdeps/x86/nptl -I../sysdeps/unix/sysv/linux/wordsize-64 -I../sysdeps/x86_= 64/nptl -I../sysdeps/unix/sysv/linux/include -I../sysdeps/unix/sysv/linux = -I../sysdeps/nptl -I../sysdeps/pthread -I../sysdeps/gnu -I../sysdeps/un= ix/inet -I../sysdeps/unix/sysv -I../sysdeps/unix/x86_64 -I../sysdeps/uni= x -I../sysdeps/posix -I../sysdeps/x86_64/64 -I../sysdeps/x86_64/fpu/mult= iarch -I../sysdeps/x86_64/fpu -I../sysdeps/x86/fpu -I../sysdeps/x86_64/m= ultiarch -I../sysdeps/x86_64 -I../sysdeps/x86/include -I../sysdeps/x86 -= I../sysdeps/ieee754/float128 -I../sysdeps/ieee754/ldbl-96/include -I../sys= deps/ieee754/ldbl-96 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754/flt= -32 -I../sysdeps/wordsize-64 -I../sysdeps/ieee754 -I../sysdeps/generic = -I.. -I../libio -I. -nostdinc -isystem /gnu/store/qzqq7za0mqvxgp7q8jmzd97c2= 2xbqd18-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/include -isyst= em /gnu/store/qzqq7za0mqvxgp7q8jmzd97c22xbqd18-gcc-7.5.0-lib/lib/gcc/x86_64= -unknown-linux-gnu/7.5.0/include-fixed -isystem /gnu/store/sjq77rvlryjgksni= 6ry1648xkj807ynv-linux-libre-headers-5.15.49/include -D_LIBC_REENTRANT -inc= lude /tmp/guix-build-glibc-2.35.drv-0/build/libc-modules.h -DMODULE_NAME=3D= libc -include ../include/libc-symbols.h -DPIC -DSHARED -DTOP_NAMESPACE= =3Dglibc -o /tmp/guix-build-glibc-2.35.drv-0/build/dlfcn/dlopenold.os -MD -= MP -MF /tmp/guix-build-glibc-2.35.drv-0/build/dlfcn/dlopenold.os.dt -MT /tm= p/guix-build-glibc-2.35.drv-0/build/dlfcn/dlopenold.os "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 60: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 62: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 63: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 64: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 65: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 66: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 67: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 68: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 69: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 70: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 263: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 265: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 266: syntax error "/gnu/store/d90028hf869mppv8pspbpgbj7xmdj4h6-gnumach-headers-cross-i586-pc-= gnu-1.8+git20221224/include/mach/mach_types.defs", line 267: type 'rpc_time= _value_t' not defined echo 'dlfcn/dladdr.o dlfcn/dladdr1.o dlfcn/dlclose.o dlfcn/dlerror.o dlfcn/= dlinfo.o dlfcn/dlmopen.o dlfcn/dlopen.o dlfcn/dlsym.o dlfcn/dlvsym.o dlfcn/= libc_dlerror_result.o' > /tmp/guix-build-glibc-2.35.drv-0/build/dlfcn/stamp= .oT mv -f /tmp/guix-build-glibc-2.35.drv-0/build/dlfcn/stamp.oT /tmp/guix-build= -glibc-2.35.drv-0/build/dlfcn/stamp.o make[2]: *** [Machrules:168: /tmp/guix-build-glibc-hurd-headers-cross-i586-= pc-gnu-2.37.drv-0/build/mach/mach/mach_interface.__h] Error 1 make[2]: Leaving directory '/tmp/guix-build-glibc-hurd-headers-cross-i586-p= c-gnu-2.37.drv-0/glibc-2.37/mach' make[1]: *** [Makefile:484: mach/install-headers] Error 2 make[1]: Leaving directory '/tmp/guix-build-glibc-hurd-headers-cross-i586-p= c-gnu-2.37.drv-0/glibc-2.37' make: *** [Makefile:9: install-headers] Error 2 error: in phase 'install': uncaught exception: %exception #<&invoke-error program: "make" arguments: ("install-headers") e= xit-status: 2 term-signal: #f stop-signal: #f>=20 phase `install' failed after 8.6 seconds command "make" "install-headers" failed with status 2 echo 'dlfcn/dladdr.os dlfcn/dladdr1.os dlfcn/dlclose.os dlfcn/dlerror.os dl= fcn/dlinfo.os dlfcn/dlmopen.os dlfcn/dlopen.os dlfcn/dlsym.os dlfcn/dlvsym.= os dlfcn/libc_dlerror_result.os dlfcn/dlopenold.os' > /tmp/guix-build-glibc= -2.35.drv-0/build/dlfcn/stamp.osT builder for `/gnu/store/vk634lqm1fr9bfq1w6n68x33cj1vvyv8-glibc-hurd-headers= -cross-i586-pc-gnu-2.37.drv' failed with exit code 1 @ build-failed /gnu/store/vk634lqm1fr9bfq1w6n68x33cj1vvyv8-glibc-hurd-heade= rs-cross-i586-pc-gnu-2.37.drv - 1 builder for `/gnu/store/vk634lqm1fr9bfq1w= 6n68x33cj1vvyv8-glibc-hurd-headers-cross-i586-pc-gnu-2.37.drv' failed with = exit code 1 --8<---------------cut here---------------end--------------->8--- Thoughts? Ludo=E2=80=99. From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jul 2023 19:00:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Janneke Nieuwenhuizen Cc: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16893611967861 (code B ref 63527); Fri, 14 Jul 2023 19:00:02 +0000 Received: (at 63527) by debbugs.gnu.org; 14 Jul 2023 18:59:56 +0000 Received: from localhost ([127.0.0.1]:43501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKO1D-00022i-Nt for submit@debbugs.gnu.org; Fri, 14 Jul 2023 14:59:55 -0400 Received: from jpoiret.xyz ([206.189.101.64]:47646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKO1B-00022a-Mg for 63527@debbugs.gnu.org; Fri, 14 Jul 2023 14:59:54 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B398718519E; Fri, 14 Jul 2023 18:59:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1689361191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/f3h7wpjic6cYkHCOWU8JNk7TjulIR1dZvK+3sEIAHI=; b=ncAUDuYR+VjwRh9BE+CNnCk+ZDtzKoCSd4VW1QdWnjXRYFy+u41lM9gwLdcy9j9hWKMxYE 6diQlvb/GjFlkMOcV7Jpl+PU5hKhOdt9hpxpzFfGEsGZZRKszTlwcqQmcVGQn2Y6Bl+uNM uiaMWgtlLILiLNAHRKEtlRE10E2r/bjWfqAwIT9imCFvtucO+v940KBRmNTmwfYyRG+jVg mer+LAnkmBF+e8xUkFxo9VYp6jAenFNokc2Eq4wZ18v/Y0Uwa3p6/ohnbEe+FWun5ykZ9v WwbURfpt+JRcLFBsT17cOZEEtpimb1ecoRGUT5A5dbAh2TeZfV7vJjDHTWU1bA== From: Josselin Poiret In-Reply-To: <87bkgewr4j.fsf@gnu.org> References: <87cz2qoyrw.fsf_-_@gnu.org> <87ttw2xds4.fsf@gnu.org> <87bkgf91kx.fsf@jpoiret.xyz> <874jm7hfpc.fsf@gnu.org> <87bkgewr4j.fsf@gnu.org> Date: Fri, 14 Jul 2023 20:59:46 +0200 Message-ID: <87zg3y71zx.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: -- Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, Ludovic Court=C3=A8s writes: > However, there seem to be regressions when cross-compiling to > i586-pc-gnu, such as : That's because of the revert of the mig update in a041bbb4bf98cce72b14c554369fc56eeacc2f5d, since it apparently caused problems on the data service. I don't expect anything to build without the new mig version, but I have no idea what could be causing this issue. Janneke, have you ever run into such a thing when building natively? Maybe it's just the childhurds not having enough RAM? Best, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmSxmyIQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaihanC/4tTAPJulSaGs0dYkydfb/NcTZdQDLJEb5j LB99dfXn86+5O/5X9UZdslqm8TTn9Di4MWabxDR3hTaTGaT6UiCatKH8Mvgl38Lj 5JKNv1uYj8zRRsyr3ymm3/2FimK/T6BjM+zri3giMIxA2RhRQqQzDK4RR6WjHeo7 WTxCZ5BiBzxQngQVq4nkDsDWN9Yy0PtAeaHhan1QQbA3HbLgp/hoYmiSSdg/R7l9 U2fzpKQVGDwj0Uf3kG6TJnPYRKOXsqqCqJb0bdiJFAFjOoumrLKm4Rszx4F8FWxk sPogBn6IltS/FD/LJrMUqTwvZ4IgIsYXKNJ+svK8eJFfkyugxoKhwqFFKYM4Xwhb 0OhEvqJTrxVzbk9XxB6BdVzorELln9jBj9b1U/Op/bdzab/GzvNFINCXQ4mMKzb4 ySVK9mVuG9vTjG8k6rXV9Xon38abDQYzcj419Agjk7DuKChJ2RxYr4CQ6I2xhc0B gt1lnfBZXjMB2qXmUlSboTFHP2jufM8= =Wj3k -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Sep 08 16:47:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jul 2023 23:36:01 +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: Josselin Poiret Cc: 63527@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.16893777294750 (code B ref 63527); Fri, 14 Jul 2023 23:36:01 +0000 Received: (at 63527) by debbugs.gnu.org; 14 Jul 2023 23:35:29 +0000 Received: from localhost ([127.0.0.1]:43644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKSJt-0001EW-13 for submit@debbugs.gnu.org; Fri, 14 Jul 2023 19:35:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKSJq-0001ED-RN for 63527@debbugs.gnu.org; Fri, 14 Jul 2023 19:35:28 -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 1qKSJk-0008Mg-Ls; Fri, 14 Jul 2023 19:35:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=M/Sx+l81b/XvurWwIopvwf1sBK/Lhn5Eqh1MEGM/6Ik=; b=HvSmJ09hrSijl4Mrhzk+ saMTDMOMjt46M6eSTqvhm0aqw8t1WgL/3XWuWRSmsD7biYxj+aZyWNLwJj5O6WRhLg9k+itS42keS kE2sKMsb50rMfcZVI+YYZHdiexAegNIYpaPIB0NCYHHNcOEfrGsA61pqoaKal4dFZPTXHHEV3na3l 69cGme/Kx20NOfszIovoGRMuHfuwTTO7Fp8gjABilAaBiI2zssgGhJrG+4i/hCv8hIWwSAOkv+GNa BdGmXDA4urUk8FbvgHdhbUDY6TXyfzhbhSPUU6ekat3rqjXtMOnSWorquWIJKIk0AiL9fkAJNrZZI bxFFE1Vbsm4f6A==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKSJk-0001cJ-92; Fri, 14 Jul 2023 19:35:20 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87cz2qoyrw.fsf_-_@gnu.org> <87ttw2xds4.fsf@gnu.org> <87bkgf91kx.fsf@jpoiret.xyz> <874jm7hfpc.fsf@gnu.org> <87bkgewr4j.fsf@gnu.org> <87zg3y71zx.fsf@jpoiret.xyz> X-Url: http://AvatarAcademy.nl Date: Sat, 15 Jul 2023 01:35:16 +0200 In-Reply-To: <87zg3y71zx.fsf@jpoiret.xyz> (Josselin Poiret's message of "Fri, 14 Jul 2023 20:59:46 +0200") Message-ID: <87zg3yf4nf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Josselin Poiret writes: > Hi Ludo, > > Ludovic Court=C3=A8s writes: > >> However, there seem to be regressions when cross-compiling to >> i586-pc-gnu, such as : > > That's because of the revert of the mig update in > a041bbb4bf98cce72b14c554369fc56eeacc2f5d, since it apparently caused > problems on the data service. I don't expect anything to build without > the new mig version, but I have no idea what could be causing this > issue. Yes, I re-cherry-picked the mig update and put it at the bottom of hurd-team and can confirm that /gnu/store/8syklh9kg8rlkalzmb2rzgj0z6fgabyr-guile-static-stripped-tarba= ll-3.0.9 > Janneke, have you ever run into such a thing when building > natively? Maybe it's just the childhurds not having enough RAM? I've got no idea; it was suggested on IRC that a circular dependency was created and that may be true. Like you remarked on IRC, we probably need the commencement patches too. We can see about the rest of hurd-team that's mostly about building guix natively, later. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com