From patchwork Thu May 18 08:45:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50095 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C1B1627BBE9; Thu, 18 May 2023 09:47:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3214527BBE2 for ; Thu, 18 May 2023 09:47:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHu-0004XG-1u; Thu, 18 May 2023 04:47:06 -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 1pzZHr-0004WS-LN for guix-patches@gnu.org; Thu, 18 May 2023 04:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHr-0006Z1-Ao for guix-patches@gnu.org; Thu, 18 May 2023 04:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHr-0002lm-5m for guix-patches@gnu.org; Thu, 18 May 2023 04:47:03 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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") From patchwork Thu May 18 08:46:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50093 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E787C27BBE9; Thu, 18 May 2023 09:47:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CEE4B27BBE2 for ; Thu, 18 May 2023 09:47:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHs-0004Wb-4E; Thu, 18 May 2023 04:47:04 -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 1pzZHq-0004WA-OL for guix-patches@gnu.org; Thu, 18 May 2023 04:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHq-0006Yq-GE for guix-patches@gnu.org; Thu, 18 May 2023 04:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHq-0002lX-CA for guix-patches@gnu.org; Thu, 18 May 2023 04:47:02 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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) From patchwork Thu May 18 08:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50096 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6181A27BBEA; Thu, 18 May 2023 09:47:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E9D5C27BBE2 for ; Thu, 18 May 2023 09:47:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHv-0004Z8-Su; Thu, 18 May 2023 04:47:07 -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 1pzZHt-0004XY-HG for guix-patches@gnu.org; Thu, 18 May 2023 04:47:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHt-0006ZQ-98 for guix-patches@gnu.org; Thu, 18 May 2023 04:47:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHt-0002mF-57 for guix-patches@gnu.org; Thu, 18 May 2023 04:47:05 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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.")))))) From patchwork Thu May 18 08:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50094 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ED87727BBE9; Thu, 18 May 2023 09:47:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BBD4127BBE2 for ; Thu, 18 May 2023 09:47:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHv-0004YR-Ch; Thu, 18 May 2023 04:47:07 -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 1pzZHt-0004XH-1V for guix-patches@gnu.org; Thu, 18 May 2023 04:47:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHs-0006ZK-P3 for guix-patches@gnu.org; Thu, 18 May 2023 04:47:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHs-0002m8-Ky for guix-patches@gnu.org; Thu, 18 May 2023 04:47:04 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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) From patchwork Thu May 18 08:46:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50092 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 650F227BBE9; Thu, 18 May 2023 09:47:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E423027BBEA for ; Thu, 18 May 2023 09:47:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHv-0004YQ-Ac; Thu, 18 May 2023 04:47:07 -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 1pzZHs-0004WZ-0X for guix-patches@gnu.org; Thu, 18 May 2023 04:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHr-0006Z7-P9 for guix-patches@gnu.org; Thu, 18 May 2023 04:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHr-0002lt-KS for guix-patches@gnu.org; Thu, 18 May 2023 04:47:03 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/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"))) From patchwork Thu May 18 08:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50091 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E905127BBEA; Thu, 18 May 2023 09:47:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3407527BBE9 for ; Thu, 18 May 2023 09:47:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHv-0004Yr-LS; Thu, 18 May 2023 04:47:07 -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 1pzZHs-0004X1-Fm for guix-patches@gnu.org; Thu, 18 May 2023 04:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHs-0006ZE-81 for guix-patches@gnu.org; Thu, 18 May 2023 04:47:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHs-0002m0-3H for guix-patches@gnu.org; Thu, 18 May 2023 04:47:04 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 ;; From patchwork Thu May 18 08:46:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50090 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 297D127BBE2; Thu, 18 May 2023 09:47:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A0A5A27BBE9 for ; Thu, 18 May 2023 09:47:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzZHw-0004Zc-Dq; Thu, 18 May 2023 04:47:08 -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 1pzZHu-0004YG-0W for guix-patches@gnu.org; Thu, 18 May 2023 04:47:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzZHt-0006ZW-Nu for guix-patches@gnu.org; Thu, 18 May 2023 04:47:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzZHt-0002mN-Jo for guix-patches@gnu.org; Thu, 18 May 2023 04:47:05 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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?)