From patchwork Mon Jun 3 20:01:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 65161 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 AFEE327BBEA; Mon, 3 Jun 2024 21:02:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6DACE27BBE2 for ; Mon, 3 Jun 2024 21:02:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEDsP-00021N-NB; Mon, 03 Jun 2024 16:01:53 -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 1sEDsM-00020n-CG for guix-patches@gnu.org; Mon, 03 Jun 2024 16:01:52 -0400 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 1sEDsM-000789-3O for guix-patches@gnu.org; Mon, 03 Jun 2024 16:01:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sEDsY-0000a7-K9; Mon, 03 Jun 2024 16:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71348] [PATCH 1/2] gnu: grub: Update to 2.12. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 20:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71348@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 71348-submit@debbugs.gnu.org id=B71348.17174449172208 (code B ref 71348); Mon, 03 Jun 2024 20:02:02 +0000 Received: (at 71348) by debbugs.gnu.org; 3 Jun 2024 20:01:57 +0000 Received: from localhost ([127.0.0.1]:55731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEDsS-0000ZX-Du for submit@debbugs.gnu.org; Mon, 03 Jun 2024 16:01:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEDsQ-0000Z6-2z for 71348@debbugs.gnu.org; Mon, 03 Jun 2024 16:01:55 -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 1sEDs6-00076j-Up; Mon, 03 Jun 2024 16:01:34 -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=8jT+r1x/1db7XajT/FyyiuiurZvs3iVsLsB9yI/3eb0=; b=mr9pZMzoN4m1MZKXEkHI iECJR4z2zCAzLpJZbvA21zT2peuTkLWdmp0fDvrHCmkgb3wQ5XR43A/ij5s3fIZdetl/R2GNoxolv ETGULsta5K3SUid7UNwcmANGbpQ7Emtwu7sV4aCXv1NAAsQSTgyxem0u3Kl95V7qgARq5OWkk65CC tqZK013umsmufNcxaS+HyP5kPhrTKJ83talj34zcqV4I3+iTpQMSgO73O8syQSTWQlDDL4eqAwp3/ s6qUbTOmVKnUEUoRuZpqkxhL1D1cFpCJbuydTCqvi9I6VgzNB/OrTTfrmelv7EtjQijCXiOVplgp/ nbke+UHeBNaZtQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 3 Jun 2024 22:01:22 +0200 Message-ID: <57843a086c81c4be2c540d623d46b0d2565958cc.1717434693.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.1 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/bootloaders.scm (grub): Update to 2.12. [source](patches): Remove ‘grub-ignore-metadata-csum-seed.patch’. (snippet): Create ‘grub-core/extra_deps.lst’. Replace “exit 99” by “exit 77”. (grub-coreboot): Update value of ‘XFAIL_TESTS’. * gnu/packages/patches/grub-ignore-metadata-csum-seed.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: Ia31b3b7e0a2e7de42d30229733e9c196fcd12fd9 --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 27 ++++++---- .../grub-ignore-metadata-csum-seed.patch | 54 ------------------- 3 files changed, 16 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/grub-ignore-metadata-csum-seed.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6934d5ccc77..eab949f0775 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1424,7 +1424,6 @@ dist_patch_DATA = \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-setup-root.patch \ - %D%/packages/patches/grub-ignore-metadata-csum-seed.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-so-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f37344c25bb..4e932ee3288 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2019, 2021, 2023 Ludovic Courtès +;;; Copyright © 2013-2019, 2021, 2023-2024 Ludovic Courtès ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen @@ -104,25 +104,28 @@ (define unifont (define-public grub (package (name "grub") - (version "2.06") + (version "2.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) (sha256 (base32 - "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp")) + "1ahgzvvvwdxx7rl08pv5dyqlgp76jxz0q2cflxvsdsn4yy8p7jgk")) (patches (search-patches "grub-efi-fat-serial-number.patch" - "grub-setup-root.patch" - "grub-ignore-metadata-csum-seed.patch")) + "grub-setup-root.patch")) (modules '((guix build utils))) (snippet - '(begin - ;; Adjust QEMU invocation to not use a deprecated device - ;; name that was removed in QEMU 6.0. Remove for >2.06. - (substitute* "tests/ahci_test.in" - (("ide-drive") - "ide-hd")))))) + #~(begin + ;; Add file missing from the release tarball. + (call-with-output-file "grub-core/extra_deps.lst" + (lambda (port) + (display "depends bli part_gpt\n" port))) + + ;; Use exit code 77, not 99, to tell Automake that a test + ;; is skipped. + (substitute* (find-files "tests" "\\.in$") + (("exit 99") "exit 77")))))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -348,8 +351,10 @@ (define-public grub-coreboot "grub_script_return" "grub_script_setparams" "grub_cmd_date" + "grub_cmd_set_date" "grub_cmd_sleep" "grub_cmd_regexp" + "grub_cmd_test" "grub_script_not" "grub_cmd_echo" "grub_script_expansion" diff --git a/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch b/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch deleted file mode 100644 index cd9b897aa65..00000000000 --- a/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 -Author: Javier Martinez Canillas -Date: Fri Jun 11 21:36:16 2021 +0200 - - fs/ext2: Ignore checksum seed incompat feature - - This incompat feature is used to denote that the filesystem stored its - metadata checksum seed in the superblock. This is used to allow tune2fs - changing the UUID on a mounted metdata_csum filesystem without having - to rewrite all the disk metadata. However, the GRUB doesn't use the - metadata checksum at all. So, it can just ignore this feature if it - is enabled. This is consistent with the GRUB filesystem code in general - which just does a best effort to access the filesystem's data. - - The checksum seed incompat feature has to be removed from the ignore - list if the support for metadata checksum verification is added to the - GRUB ext2 driver later. - - Suggested-by: Eric Sandeen - Suggested-by: Lukas Czerner - Signed-off-by: Javier Martinez Canillas - Reviewed-by: Lukas Czerner - Reviewed-by: Daniel Kiper - -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e66..4953a1591 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 - #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 - #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 - #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 - - /* The set of back-incompatible features this driver DOES support. Add (OR) -@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+"); - * mmp: Not really back-incompatible - was added as such to - * avoid multiple read-write mounts. Safe to ignore for this - * RO driver. -+ * checksum seed: Not really back-incompatible - was added to allow tools -+ * such as tune2fs to change the UUID on a mounted metadata -+ * checksummed filesystem. Safe to ignore for now since the -+ * driver doesn't support checksum verification. However, it -+ * has to be removed from this list if the support is added later. - */ - #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ -- | EXT4_FEATURE_INCOMPAT_MMP) -- -+ | EXT4_FEATURE_INCOMPAT_MMP \ -+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED) - - #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U -