From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8GpWOqCJM2cT/AAAe85BDQ:P1 (envelope-from ) for ; Tue, 12 Nov 2024 17:00:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8GpWOqCJM2cT/AAAe85BDQ (envelope-from ) for ; Tue, 12 Nov 2024 18:00:17 +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=MUNY2dca; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=IPu5lXXI; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731430816; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=slpZ+ySn88xKLht2WSlqgbY5THy8oU9A+TRmKZeHC+U=; b=fa67Ks0FlLOJHdnU4u9L5TtMdfoMc22HmewT6jOkAs3Q0fhdTkZmaCtpi9NUpPj0Xceq7I RLqjOBt59w0GBf4PAUrF5NDg2hqK4o9SU+n3e8bcqXpVGqmNcQfx3eWeBDg/cudkkZR6PS pxPFTRQYM2/wbyDbAClkJVD2i0xbjgHSQAJYWrfHOUn2ud6i5cdOBRTpM2jy5o1DVbZ78R ek4gD1ck4sIa7ano/PnSSAhqnFrFsfIHFL+ffR53rDHKVzndzqU+IeH5d5FVsyX6xCUFzq owXOVDAa0LXfIMTjkl8UTXZRINGK36+NRCQnTDdZjLbTZgskgZGZFFC8ARPg/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MUNY2dca; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=IPu5lXXI; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731430816; a=rsa-sha256; cv=none; b=kYLxutYeux4QDvrOh6VPPats3IJ9Xz2D+A2uyIQh3nZOeVnlqZ/lZ8St5iil06AIPqCDUF v/h/CPh7eAeFz6Cw61an83qDe64WcIO8uFBC3GavkBFNqxSFcqzR8mScBZO8igEqLObJqA V+QhIfz0L2lrpKdt4sWRTANgB3DxeZIngHAMRPUgBAWhxVYSRZr7RKCg7iLMudSpqpVCMy oM2o65NUnubbuvamay2KhW12wJQNZo2j3VRjFBPqiQta8R+d9x6mIGBKwh5rWTlNLr/ewN TvICAh7W+ggDfv7yr3Aj6d8Mn9QiiXvosCeVTxTew4eBVK50vLyqly9Zly5JJw== 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 0C7AF844C2 for ; Tue, 12 Nov 2024 18:00:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmc-00047a-FH; Tue, 12 Nov 2024 11:30:26 -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 1tAtmZ-00044I-Gi for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -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 1tAtmZ-0005z3-79 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -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=slpZ+ySn88xKLht2WSlqgbY5THy8oU9A+TRmKZeHC+U=; b=MUNY2dcacFgv+StZ/wNK7UU8ZiisSwdLhIwQQBK7qSpSt7+81kr3bsfH1kXV4sUoXvXFV6zMeYfTpid8Ohj3aad3Bjtr8JGW2X1HtnxurpbrBejYFvJ9bIBtnMPrcBdPIpjGrnMfc8bFKgt9dPIkURAgpgZj/8Eolvc6hQyWY+pLgG51NAwq1e7Sd6V5R4eAZ7OTI6yVQKBUDSxpOh9iQAlF96KS9R0W428Wh4nIeh7Ax6hb/fzUblrU7DVxwicT3ENc/vYq6EEtVMHIn/jnXm5BDhqzhBjv1xBLokmMovKghO6YOpmANrezIBILGz+01y/VrvkeJBKLQ7cauQAWWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmY-0000ZA-Jg; Tue, 12 Nov 2024 11:30:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 29/40] gnu: grub: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:22 +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 Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290121911 (code B ref 74290); Tue, 12 Nov 2024 16:30:22 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:12 +0000 Received: from localhost ([127.0.0.1]:39200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmN-0000U4-4Z for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlp-0000K3-Pw for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:38 -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 1tAtje-0005PS-EZ; Tue, 12 Nov 2024 11:27:22 -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=slpZ+ySn88xKLht2WSlqgbY5THy8oU9A+TRmKZeHC+U=; b=IPu5lXXI4zX1XAhZwP5B Bb2bkmFQ1dyGBuqQvHpZi0iAq0Z2Zz8fMjX1hO8rRVUtTL1x/uzMGRkwBejVngHdRTKkUTT3qbsZ9 RC1iWKc0a3T+ffRcZ0HbULZWBRYTYg/ODAdfIolcu+yDWNJJ9iLcEMLm8Sq9UPKA/MJnz09L0T3k9 ZZmwfUGnbIMdjd3fYoKiIlMWO/q2RzaQYPPO1WeU/exWckIVbgwJxztD+F3z7N/tjwleG7JZERc2A z0fKk4L5HrdrxN8QScBqzc8UeUGyLjruoMJXe4qilL/fijhD3rKEDPrwh0i6e50Eke0j9MzdvaAMU cFd9sapKTSZUUQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:38 +0100 Message-ID: <5ccd41575a2915402ce6eb1175cd6c149f762ae8.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 0.88 X-Spam-Score: 0.88 X-Migadu-Queue-Id: 0C7AF844C2 X-TUID: kqDdDuHMYVf3 * gnu/packages/patches/grub-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd64-patch" stage. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 8 +++++++ gnu/packages/patches/grub-hurd64.patch | 32 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 gnu/packages/patches/grub-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0759555494..2b8a8d7065 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1488,6 +1488,7 @@ dist_patch_DATA = \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ + %D%/packages/patches/grub-hurd64.patch \ %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e188553910..caec26edc7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -192,6 +192,14 @@ (define-public grub (setenv "BUILD_FREETYPE_CFLAGS" (string-append "-I" freetype "/include/freetype2")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "grub-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()) (add-before 'check 'disable-flaky-test (lambda _ ;; This test is unreliable. For more information, see: diff --git a/gnu/packages/patches/grub-hurd64.patch b/gnu/packages/patches/grub-hurd64.patch new file mode 100644 index 0000000000..d5acd99eb8 --- /dev/null +++ b/gnu/packages/patches/grub-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Not presented upstream. + +From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 8 Nov 2024 11:47:49 +0100 +Subject: [PATCH] osdep/hurd: Support the 64bit Hurd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +* grub-core/osdep/hurd/getroot.c (grub_util_find_hurd_root_device): +Use mach_msg_type_number_t instead of size_t. +--- + grub-core/osdep/hurd/getroot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c +index 0efefdab4..b849700e6 100644 +--- a/grub-core/osdep/hurd/getroot.c ++++ b/grub-core/osdep/hurd/getroot.c +@@ -58,7 +58,7 @@ grub_util_find_hurd_root_device (const char *path) + file_t file; + error_t err; + char *argz = NULL, *name = NULL, *ret; +- size_t argz_len = 0; ++ mach_msg_type_number_t argz_len = 0; + int i; + + file = file_name_lookup (path, 0, 0); +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com