From patchwork Tue Nov 12 16:25:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70288 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 D010127BBEA; Tue, 12 Nov 2024 16:30:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 7240F27BBE2 for ; Tue, 12 Nov 2024 16:30:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmH-0003T5-Ta; Tue, 12 Nov 2024 11:30:05 -0500 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 1tAtmG-0003O3-CD for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmG-0005rf-2Z for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8LFHZpZcjLjaAjS0I/16HGtQeIfLQFNJAfIVuhFJKxs=; b=mvwnRtRlonPzoO/RzA5S2x8Zy/IfVqwEK4hMuDTUZopuWWQaQW6ItOR0lrDf/6omGSKQttvimlY0bwhpyVSZU+3fII+L+Zor6oYJCjUENrU+N/Mc1hZy9SNcl83u8jr/U9S5hLZ5NHv1r+XfiJcmLHG80LmpuAgV/TLhUoLoDe/9ltHrkUSlXP5hDM1NM+Lw1bt9Ril2jRnkOF6kDbgRDmBdPWfT995oRxSQ7Gjrw4tiF3jtoZPmUKMCGAFABJayPecU36ciRISBIGgFSVnh1mpUHeEHBWDLggHrdpNaKgu17Ji8TSpfRY1I1U0ST/7VofzSoFczLaivQaXISlpQaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmF-0000P6-Rb for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 03/40] gnu: hurd: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.1731428948999 (code B ref 74290); Tue, 12 Nov 2024 16:30:03 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:08 +0000 Received: from localhost ([127.0.0.1]:39045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlL-0000Fz-8Z for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlG-0000Eo-Vl for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:03 -0500 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 1tAtj4-0005Jx-Sa; Tue, 12 Nov 2024 11:26:46 -0500 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=8LFHZpZcjLjaAjS0I/16HGtQeIfLQFNJAfIVuhFJKxs=; b=lNIah1yUNq9tqbpIH0bq qfKD66qauiaDxaCsvKBnqks+pB/204zav8UwUHIXp6x3hUyVrTBTs/iOxR4mo6LmHvv65q8ixAi4t Jf7Q/emGvF0lE6056iav9MM7yPejvMtZsfx1Sy2n5f8BJhCzkv+oSJq8NOnyVdQHZBNEH4ErNLcd0 51uUJYt5y56CT0cWtXwKf6vh51kCOLd7mr2Hf7TGiDRUGUgi4JEejfBHBMmrMTuuWvuymmpsy7Hjx 7bKIiWmSSEVonpx05HZLkGQBhz2rxPSaJgNqPF2MwIF6X+XHXUmY6jRyglq0pvANGCYgUkq88KADY dQlQ8hNxH3KF3w==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:12 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 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-headers): Update to 0.9.git20240714. (hurd)[arguments]: Remove rumpdisk build hack from "prepare-addons" stage. Instead, when cross-compiling, add stage "fixup-cross-configure" to enable rumpdisk. * gnu/system.scm (hurd-multiboot-modules): Remove "--x-xattr-translator-records" option that has been removed and is now the default. Change-Id: I4609b5a959c1ece98e2fe1aedbb1d31d6edadcca --- gnu/packages/hurd.scm | 12 +++++++++--- gnu/system.scm | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 28f39cc448..06fae1bd3b 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -132,7 +132,7 @@ (define-public mig (define-public hurd-headers (let ((revision "3") - (commit "v0.9.git20231217")) + (commit "v0.9.git20240714")) (package (name "hurd-headers") (version (string-drop commit 1)) @@ -143,7 +143,7 @@ (define-public hurd-headers (commit commit))) (sha256 (base32 - "1d138kzhil6s5gf9di8grpz1iziakyfv037wkc8s7qyd61imm31d")) + "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -336,7 +336,7 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit rumpdisk")))) + "libbpf libmachdevdde libddekit ")))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -362,6 +362,12 @@ (define-public hurd (("#include " m) (string-append "#include \n#include \n" m))) #t)) + ,@(if (%current-target-system) + '((add-after 'configure 'fixup-cross-configure + (lambda _ + (substitute* "config.make" + (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes"))))) + '()) (add-before 'build 'pre-build (lambda _ ;; Don't change the ownership of any file at this time. diff --git a/gnu/system.scm b/gnu/system.scm index 074cd04a0e..dfcb8fb279 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1539,7 +1539,6 @@ (define (hurd-multiboot-modules os) "--multiboot-command-line='${kernel-command-line}'" "--exec-server-task='${exec-task}'" "--store-type=typed" - "--x-xattr-translator-records" "'${root}'" "'$(fs-task=task-create)'")) (target (%current-target-system))