From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4FLWBfyJY2RyIAEASxT56A (envelope-from ) for ; Tue, 16 May 2023 15:49:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GKWrBfyJY2SrOwAAauVa8A (envelope-from ) for ; Tue, 16 May 2023 15:49:48 +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 D29C12AF5F for ; Tue, 16 May 2023 15:49:47 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyv33-0004IE-Gv; Tue, 16 May 2023 09:49: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 1pyv31-0004HA-HI for guix-patches@gnu.org; Tue, 16 May 2023 09:49: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 1pyv31-0004Jm-94 for guix-patches@gnu.org; Tue, 16 May 2023 09:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyv31-0007eo-5B for guix-patches@gnu.org; Tue, 16 May 2023 09:49:03 -0400 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-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=1684244987; a=rsa-sha256; cv=none; b=bSWmt1ikGIG70qFB2HAnxFn14A+i7LHd13mjY5Mb7/XnZibA7jUrhJ9CWSxUPL4/yhUDTQ hMqqnzGn1Pf1dFlh9m/7hdaXdcMWuoEr180LcQQ0W5TSPzVnH/RVrZ/9Er44v73BBXsAcG b0cx4nFzM3PrYqxmWD3fsvw9WYeZ/gqOfJx0rPIz02F8h8c5LmIKS2S2CdP0IUwmcqf8DG cHG0f7qca1EHtZLmu+Jrg322+GWHQjMG2Qb5tiEokcdQTXub2tkemEmK75+qXwMHx0SWr+ ZJM+5w1MvLcm8yejJRvygRNVLUSpzGxH/kLqOTnVA1ToNkKU0ai2oddbe8WClw== 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=G1oEYXAL; 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=1684244987; 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=oJlzhM2EtZTxYs9/OtZH9nYMALaefAyBMm3TTTXWNi0=; b=e9ZlQjL1s8bD9a0wR3SlImsE3F0q2Gy3YbkXVuy5PF2i4Ok4FbXzdsec+7DLJC+OPFFXdK 6h6vDIoiGwwTzK/S784R2nvelJywDdpDXch9gdx0ULEsfCGdJNgTg76/cLwpqcLrcYPpDA qrbheFk/a8GdMzKW4qzg16wMkACWXHjnOIAYuVRwkVSE2P101HwSnjYJ5U4CunuLBZgjDl Gkh2C+PAfaSnUcAKiDOF4/N5zbAu0CPcegShBzSmZaXkhsE/cbiclZzGPQ8btzcRP0sfWY jZ2IHB9nxn2MOWJ4jiOZ7+DsN9mn2VXPRMMZwS7LWyxQcJD2Ig9ZC8ZR+xjC+A== 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=G1oEYXAL; 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: -2.59 X-Spam-Score: -2.59 X-Migadu-Queue-Id: D29C12AF5F X-TUID: PR7CxxAyvMlm * 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