From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4OBMHy+KYmQM9gAASxT56A (envelope-from ) for ; Mon, 15 May 2023 21:38:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2EBfHi+KYmTz+QAAG6o9tA (envelope-from ) for ; Mon, 15 May 2023 21:38:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4EC3D37980 for ; Mon, 15 May 2023 21:38:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pye1F-0008Uy-5I; Mon, 15 May 2023 15:38:05 -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 1pye1D-0008UO-Cq for guix-patches@gnu.org; Mon, 15 May 2023 15:38: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 1pye1D-0000F1-57 for guix-patches@gnu.org; Mon, 15 May 2023 15:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pye1D-0004E3-0X for guix-patches@gnu.org; Mon, 15 May 2023 15:38:03 -0400 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684179503; a=rsa-sha256; cv=none; b=lBPhrDZ1NN3pkm4T7XV4X6SexpNvhHgfqRfbGZejSjR5Wtl0c25ghD3qQNDlDAlvR2s9ae VPCqX0hM+u1wnuxDr2vcn5pb36S5q/945i0pqDirQS5+ZMKIuZhPnqmyzlWVmRmvmjnDMn A8jkh54OdsNmts4dOytQeq66JvGgu0wkd9iPkHusOmyfRSDEz3XR3OtqEsddUqeEvePd26 W263h3VWGOb0YXR2AN+SflnvxKd+qcuFc1o0RXOOFUpxVjn2m8zSdLFUOxBnxnHKPGNGlm 2GXDbWW2wkF7M3t72sMBMw2RBGs6oT2kOip6hpxZIBFlxrHWdLKIQyeakh6SUA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="K4k/4tzC"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684179503; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=NGPGkoq+SMinUGziETMNFjF+4BHxMRu9wnBMSzvgRCg=; b=cFBxshayJjm9jLGafGhAU8AmvtfpNyda99hKtaEjxruVY7xuJ49Z9ymxGj5ByR0mPuUwtc rE0y/elWwmfDx/PBvDynQIRhSUQQvWJp3y01zC2nPH+tEWrRGCIo1agroT9AEzqH1Z0tbR jAQHKe6nOCf+OAG33u0qeTLHiJsgRUoNX/OMpfHQOpKTneFpBFipp7CNE2LVPeiiSULDea ckkuf+gRLOXebJ0Rzno8rAr0ysNNd4jM+hG4NSae6AeP4xzxLO2+4HdYu+VsRyeAZw4EWZ H96lJcN1hwhagd3PopE6Y/00SqjhzZ5fBoW7FToTygddTwVXp3eWjk4eUsKE/w== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="K4k/4tzC"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.09 X-Spam-Score: -1.09 X-Migadu-Queue-Id: 4EC3D37980 X-TUID: K0WqABGFgtCK * 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