From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id SKb5F8jfQmfBiAAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:11:52 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id SKb5F8jfQmfBiAAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:11:52 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=K+UMCt3C;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=R5eVza9H;
	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-Seal: i=1; s=key1; d=yhetil.org; t=1732435912; a=rsa-sha256; cv=none;
	b=kyKNd8eiyLeSbDCHMOx2hBymFhtvu8bRHcO3Ndngrm8s2IJHzELCXlYtmJfvs4tzx7MbFC
	cKhtI6Qz2kdFX04u0wtC8QHWXRs+8zIf/rjwL4mAM5yckv6UkAMOdx8wZTFnHUiPWQG5F2
	UhZVQE4agRQ/FaEBo5ozRqPtlzDJUtZ+1qQdIYbpMCe+RUVWBu1cst/fwwxdeFKw0b133h
	c7uLdL9OeuOV6scnH82X5gk1PQDnD2+ptWVs6bELlCeyMHNfQAuMBOHO5xGgMqbgi80s2b
	eVkO4HjMxGr2tiLF40rIh2WXcSauZJAKXLgZ/ibqNQOmsC6qfHJBfF5tqQGJ2Q==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=K+UMCt3C;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=R5eVza9H;
	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=1732435912;
	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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=;
	b=Lwgj1XhVMSSqlQf19jpXxplt06PM3vkZLN1rh3zTTvnKgJzJu8jX/1+viMFysJDVFBTl0H
	5HDXbDKpXnTC1zpMKZTmJuJquTJ3mH8BYHKcz5NFwNwTQzELFTOWCcae1GDV/+H60Vi1Yj
	1eF0ATvAKTKOFq7sOtLBdWM2Jv3J/QKJZQrr8lnHR9SWFCwwBX/jcKQXLymMKqb9Bu1Os0
	pq2VucOXe0M5zo2nwyiQUP+KKcFVrUplH35143oYI0LH5W/6PUIKvjkg1W2poBfSU36icS
	fwmrupnpbGUHPyY1/35+X/VHn8ofLMgJDCVqQvSFw+tpbaBzQlRo6KRmNEV7xA==
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 4A0F244A8
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:11:52 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7TR-0008J5-Nw; Sun, 24 Nov 2024 02:56: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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7TQ-0008II-AN
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56: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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7TQ-0001wu-1E
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56: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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=; 
 b=K+UMCt3CiAO+eufAX6MvBSGGWaEo6NuvilDwqrjyT9GYc5Xvgjiryxch9XGvac/flSK52+p1OXDsUlcSvs1ZedyIUzNjZC+5HYmO4HzuuFa/UnapmYCHRgdUXF4wbTbDy8m36AEz2hMcxJRzxAqzprmTU+xaNU+lTmxjVMhWOoy9vGrkUHliO00gqOmfSOzaiCOFBdnlKIXiOAOyXATfTeM0qG8darmxFPv2oemSm44tAHRsEeayqifWQrY9aQWre8OBozllAzZrdA/7YczaoPApcnvwVWzWbIlu6FsWGG8qe914ac5M5B1ZgH0yb1eYG+oxAKlLSo6hkuJVVmvS/w==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7TP-0004VX-Ra
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:03 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 03/58] gnu: hurd: Update to 0.9.git20240714.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:56:03 +0000
Resent-Message-ID: <handler.74290.B74290.173243495817265@debbugs.gnu.org>
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.173243495817265
 (code B ref 74290); Sun, 24 Nov 2024 07:56:03 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:58 +0000
Received: from localhost ([127.0.0.1]:60627 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7TK-0004UB-47
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -0500
Received: from eggs.gnu.org ([209.51.188.92]:41826)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7TC-0004T2-O4
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:51 -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 <janneke@gnu.org>)
 id 1tF7T6-0001rL-QC; Sun, 24 Nov 2024 02:55:45 -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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=; b=R5eVza9HmS1q1xHyc6I9
 xc5FSb5IiTS0tnWAyFdRSrnE/rJ5NgYtCszCJn4Lnlkap1SsCMJTihSykT5BlzSFgY/y86pErHq7k
 rx+yKfNbuNyw5GhTMIDSkZ8Zc15TsNYzo2rlIIG6RK2b2XL5IOLhwG3Ym2+ctpESobrkTwztdwrjY
 WNIXHNHx02CU8oQfVc10Xn3Oqha7xnagTHaaQdDikTM++YkArq8gE2IF4nG8NpqFB4Z5QJOUt+uCQ
 d6H5eaAIP4M8ZMmlUNuOeh+vhtYMqJ+sjxeS68XIF7l4ITZJFWMcYAGTEoQzK2KHa5Ikbh3Bmyvf1
 +kELgf49i8hX/g==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:54:26 +0100
Message-ID: <7e43931a12f914136fba84bc38b0eea97cdded79.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=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
X-Migadu-Spam-Score: -1.83
X-Spam-Score: -1.83
X-Migadu-Queue-Id: 4A0F244A8
X-Migadu-Scanner: mx12.migadu.com
X-TUID: HanXKRwMMBGb

* 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 <rpc/pmap_prot.h>" m)
                 (string-append "#include <rpc/types.h>\n#include <rpc/xdr.h>\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))
-- 
2.46.0