From unknown Thu Aug 14 18:36:40 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#71348 <71348@debbugs.gnu.org> To: bug#71348 <71348@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Update GRUB to 2.12 Reply-To: bug#71348 <71348@debbugs.gnu.org> Date: Fri, 15 Aug 2025 01:36:40 +0000 retitle 71348 [PATCH 0/2] Update GRUB to 2.12 reassign 71348 guix-patches submitter 71348 Ludovic Court=C3=A8s severity 71348 normal tag 71348 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 03 15:21:45 2024 Received: (at submit) by debbugs.gnu.org; 3 Jun 2024 19:21:45 +0000 Received: from localhost ([127.0.0.1]:55688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEDFZ-0007Yj-3p for submit@debbugs.gnu.org; Mon, 03 Jun 2024 15:21:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:53120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEDFT-0007YR-Sn for submit@debbugs.gnu.org; Mon, 03 Jun 2024 15:21:44 -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 1sEDFG-0000uJ-Ix for guix-patches@gnu.org; Mon, 03 Jun 2024 15:21:26 -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 1sEDFF-0005Pc-IZ; Mon, 03 Jun 2024 15:21:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=GQ/DGZQU49Lbs2EM//CfTiZFsSgiTlGeCBHJLYMcPl4=; b=FI5KgE0nfuEkRJ XD0u8tkkXz2pmWk7ff9p2XeV/IknhwV996vAALtlusYnjkDFZwdj12UsLfVvCSJvOr13AsNeIXN5o VALkcog+69tNtnkZQJwNTlGj/XkcZef6XM3HDWuHwd2o68boEWo0dGcOq1zr1CA3s900OVf0V0XBk wCoQdB2zoVwzx9B/iXzoa/lXuu0zRY9sRlvJyRnac92X8qoAp1BDaBRaYg3lRqIQlWrbjDmLjLdpR P36UTtFRltig7hPS4pG94K9E45P0z0tRptjtGHQcaAjBzIWFH8X7gNCuvt7zaOaNrxytF5xbA8dMJ K8rvxaVfrv0ilUEFo7IQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/2] Update GRUB to 2.12 Date: Mon, 3 Jun 2024 21:21:12 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Ada Stevenson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Guix! Following the discussion with Ada Stevenson¹ who reported that the e2fsprogs upgrade to 1.47.0 broke system installation, here is an upgrade of GRUB. I tested it on x86_64-linux with: ./pre-inst-env guix build grub-efi{,32} grub-coreboot grub-hybrid grub{,-minimal} ./pre-inst-env guix build grub --target=aarch64-linux-gnu ./pre-inst-env guix build grub --target=i586-pc-gnu and: make check-system TESTS="installed-os encrypted-root-os" Feedback welcome! Thanks, Ludo'. ¹ https://lists.gnu.org/archive/html/guix-devel/2024-05/msg00006.html Ludovic Courtès (2): gnu: grub: Update to 2.12. gnu: grub: Remove input labels and use gexps. gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 535 +++++++++--------- .../grub-ignore-metadata-csum-seed.patch | 54 -- 3 files changed, 268 insertions(+), 322 deletions(-) delete mode 100644 gnu/packages/patches/grub-ignore-metadata-csum-seed.patch base-commit: 2e53fa5346bf52f6d6d26e035bc905ebd410dabb -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 03 16:01:57 2024 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 71348@debbugs.gnu.org Subject: [PATCH 1/2] gnu: grub: Update to 2.12. 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 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 71348 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 - -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 03 16:02:00 2024 Received: (at 71348) by debbugs.gnu.org; 3 Jun 2024 20:02:00 +0000 Received: from localhost ([127.0.0.1]:55733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEDsV-0000Zh-3z for submit@debbugs.gnu.org; Mon, 03 Jun 2024 16:02:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEDsQ-0000Z7-Hz for 71348@debbugs.gnu.org; Mon, 03 Jun 2024 16:01:56 -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 1sEDs8-00076v-2I; Mon, 03 Jun 2024 16:01:36 -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=a8lf91ZobQJGCBhi3NtcCXR2Raw3riE4tptOL6yZY+E=; b=TzD3SYaGKHewA923RgV0 zbxO1YIQUM2YbQQ5nw3kVr4GYUh/9V6hXWNd6+FEiTO6knp1bMUMc2LENNN1oggmZa8nLpjWUrtB1 rF0beyqdlh/MDCWYMtVpqzK2j02u6oI9dwf2kpZ7ZH5Gt9XuLhXoPQyt7z9zYyKlqWQkCaPpXXt5S +eSu0jqcKruEJ1ZIK8BzMsQQkW5kqkg62eR5j/ZOYKl58cIIDGKglSCNOKqJ1qV4mGjdsIlqCxsfu psQ0ap0KyYDeDwPnX0jlHOO7to5uP1JdHLpUqZN2RFF60/1TypGPil3HWo5/IbUEAdvNOKZ4yusXc bKKpmfuNMiOuow==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 71348@debbugs.gnu.org Subject: [PATCH 2/2] gnu: grub: Remove input labels and use gexps. Date: Mon, 3 Jun 2024 22:01:23 +0200 Message-ID: <89180e3feee011bc1f3e237aad28465838fc5e61.1717434693.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 71348 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/bootloaders.scm (grub)[arguments]: Use gexps. [inputs, native-inputs]: Remove labels. (grub-minimal, grub-coreboot, grub-efi, grub-efi32) (grub-hybrid): Likewise. Change-Id: I2773e6d96d170fae991d9c5db9e10196ea603371 --- gnu/packages/bootloaders.scm | 512 +++++++++++++++++------------------ 1 file changed, 254 insertions(+), 258 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4e932ee3288..503c7d4a194 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -128,140 +128,140 @@ (define-public grub (("exit 99") "exit 77")))))) (build-system gnu-build-system) (arguments - `(#:configure-flags - ;; Counterintuitively, this *disables* a spurious Python dependency by - ;; calling the ‘true’ binary instead. Python is only needed during - ;; bootstrapping (for genptl.py), not when building from a release. - (list "PYTHON=true") - ;; Grub fails to load modules stripped with --strip-unneeded. - #:strip-flags '("--strip-debug" "--enable-deterministic-archives") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-stuff - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* "grub-core/Makefile.in" - (("/bin/sh") (which "sh"))) + (list #:configure-flags + ;; Counterintuitively, this *disables* a spurious Python dependency by + ;; calling the ‘true’ binary instead. Python is only needed during + ;; bootstrapping (for genptl.py), not when building from a release. + #~(list "PYTHON=true") - ;; Give the absolute file name of 'mdadm', used to determine the - ;; root file system when it's a RAID device. Failing to do that, - ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH. - (when (assoc-ref inputs "mdadm") - (substitute* "grub-core/osdep/linux/getroot.c" - (("argv\\[0\\] = \"mdadm\"") - (string-append "argv[0] = \"" - (assoc-ref inputs "mdadm") - "/sbin/mdadm\"")))) + ;; GRUB fails to load modules stripped with --strip-unneeded. + #:strip-flags + #~(list "--strip-debug" "--enable-deterministic-archives") - ;; Make the font visible. - (copy-file (assoc-ref (or native-inputs inputs) - "unifont") - "unifont.bdf.gz") - (system* "gunzip" "unifont.bdf.gz") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-stuff + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "grub-core/Makefile.in" + (("/bin/sh") (which "sh"))) - ;; Give the absolute file name of 'ckbcomp'. - (substitute* "util/grub-kbdcomp.in" - (("^ckbcomp ") - (string-append - (search-input-file inputs "/bin/ckbcomp") - " "))))) - (add-after 'unpack 'set-freetype-variables - ;; These variables need to be set to the native versions of the - ;; dependencies because they are used to build programs which are - ;; executed during build time. - (lambda* (#:key native-inputs #:allow-other-keys) - (when (assoc-ref native-inputs "freetype") - (let ((freetype (assoc-ref native-inputs "freetype"))) - (setenv "BUILD_FREETYPE_LIBS" - (string-append "-L" freetype - "/lib -lfreetype")) - (setenv "BUILD_FREETYPE_CFLAGS" - (string-append "-I" freetype - "/include/freetype2")))))) - (add-before 'check 'disable-flaky-test - (lambda _ - ;; This test is unreliable. For more information, see: - ;; . - (substitute* "Makefile.in" - (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") - "grub_cmd_date grub_cmd_sleep")))) - (add-before 'check 'disable-pixel-perfect-test - (lambda _ - ;; This test compares many screenshots rendered with an older - ;; Unifont (9.0.06) than that packaged in Guix. - (substitute* "Makefile.in" - (("test_unset grub_func_test") - "test_unset"))))) - ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling. - #:tests? ,(not (or (any (cute string-prefix? <> (or (%current-target-system) - (%current-system))) - '("arm" "aarch64")) - (%current-target-system))))) + ;; Give the absolute file name of 'mdadm', used to determine the + ;; root file system when it's a RAID device. Failing to do that, + ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH. + (let ((mdadm (false-if-exception + (search-input-file inputs "/sbin/mdadm")))) + (when mdadm + (substitute* "grub-core/osdep/linux/getroot.c" + (("argv\\[0\\] = \"mdadm\"") + (string-append "argv[0] = \"" mdadm "/sbin/mdadm\""))))) + + ;; Make the font visible. + (copy-file #+unifont "unifont.bdf.gz") + (system* "gunzip" "unifont.bdf.gz") + + ;; Give the absolute file name of 'ckbcomp'. + (substitute* "util/grub-kbdcomp.in" + (("^ckbcomp ") + (string-append + (search-input-file inputs "/bin/ckbcomp") + " "))))) + (add-after 'unpack 'set-freetype-variables + ;; These variables need to be set to the native versions of the + ;; dependencies because they are used to build programs which are + ;; executed during build time. + (lambda* (#:key native-inputs #:allow-other-keys) + (when (assoc-ref native-inputs "freetype") + (let ((freetype (assoc-ref native-inputs "freetype"))) + (setenv "BUILD_FREETYPE_LIBS" + (string-append "-L" freetype + "/lib -lfreetype")) + (setenv "BUILD_FREETYPE_CFLAGS" + (string-append "-I" freetype + "/include/freetype2")))))) + (add-before 'check 'disable-flaky-test + (lambda _ + ;; This test is unreliable. For more information, see: + ;; . + (substitute* "Makefile.in" + (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") + "grub_cmd_date grub_cmd_sleep")))) + (add-before 'check 'disable-pixel-perfect-test + (lambda _ + ;; This test compares many screenshots rendered with an older + ;; Unifont (9.0.06) than that packaged in Guix. + (substitute* "Makefile.in" + (("test_unset grub_func_test") + "test_unset"))))) + + ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling. + #:tests? (not (or (any (cute string-prefix? <> (%current-system)) + '("arm" "aarch64")) + (%current-target-system))))) (inputs - `(("gettext" ,gettext-minimal) + (append (list gettext-minimal freetype ncurses - ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and - ;; 'grub-install' to recognize mapped devices (LUKS, etc.) - ,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems lvm2)) - `(("lvm2" ,lvm2)) - '()) + ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It + ;; is required for generating alternative keyboard layouts. + console-setup) - ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install' - ;; to determine whether the root file system is RAID. - ,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems mdadm)) - `(("mdadm" ,mdadm)) - '()) + ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and + ;; 'grub-install' to recognize mapped devices (LUKS, etc.) + (if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems lvm2)) + (list lvm2) + '()) - ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It is required - ;; for generating alternative keyboard layouts. - ("console-setup" ,console-setup) + ;; Depend on mdadm, which is invoked by 'grub-probe' and + ;; 'grub-install' to determine whether the root file system is + ;; RAID. + (if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems mdadm)) + (list mdadm) + '()) - ;; Needed for ‘grub-mount’, the only reliable way to tell whether a given - ;; file system will be readable by GRUB without rebooting. - ,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems fuse-2)) - `(("fuse" ,fuse-2)) - '()) - - ("freetype" ,freetype) - ;; ("libusb" ,libusb) - ("ncurses" ,ncurses))) + ;; Needed for ‘grub-mount’, the only reliable way to tell whether + ;; a given file system will be readable by GRUB without + ;; rebooting. + (if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems fuse-2)) + (list fuse-2) + '()))) (native-inputs - `(("pkg-config" ,pkg-config) - ("unifont" ,unifont) - ("bison" ,bison) - ("flex" ,flex) - ("texinfo" ,texinfo) - ("help2man" ,help2man) - ("freetype" ,freetype) ;native version needed for build-grub-mkfont + (append (list pkg-config + bison + flex + texinfo + help2man + freetype ;native version needed for build-grub-mkfont - ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils - ;; capable of assembling 64-bit instructions. However, our default - ;; binutils on 32-bit x86 is not 64-bit capable. - ,@(if (string-match "^i[3456]86-" (%current-system)) - (let ((binutils (package/inherit - binutils - (name "binutils-i386") - (arguments - (substitute-keyword-arguments (package-arguments binutils) - ((#:configure-flags flags ''()) - `(cons "--enable-64-bit-bfd" ,flags))))))) - `(("ld-wrapper" ,(make-ld-wrapper "ld-wrapper-i386" - #:binutils binutils)) - ("binutils" ,binutils))) - '()) + ;; Dependencies of the test suite. + parted + xorriso) - ;; Dependencies for the test suite. The "real" QEMU is needed here, - ;; because several targets are used. - ("parted" ,parted) - ,@(if (member (%current-system) (package-supported-systems qemu-minimal)) - `(("qemu" ,qemu-minimal)) - '()) - ("xorriso" ,xorriso))) + ;; For the test suite, the "real" QEMU is needed because several + ;; targets are used. + (if (member (%current-system) (package-supported-systems qemu-minimal)) + (list qemu-minimal) + '()) + + ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils + ;; capable of assembling 64-bit instructions. However, our default + ;; binutils on 32-bit x86 is not 64-bit capable. + (if (string-match "^i[3456]86-" (%current-system)) + (let ((binutils (package/inherit + binutils + (name "binutils-i386") + (arguments + (substitute-keyword-arguments (package-arguments binutils) + ((#:configure-flags flags ''()) + `(cons "--enable-64-bit-bfd" ,flags))))))) + (list (make-ld-wrapper "ld-wrapper-i386" + #:binutils binutils) + binutils)) + '()))) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") (description @@ -286,24 +286,21 @@ (define-public grub-minimal (delete "help2man" "texinfo" "parted" "qemu" "xorriso"))) (arguments (substitute-keyword-arguments (package-arguments grub) - ((#:configure-flags _ ''()) - '(list "PYTHON=true")) + ((#:configure-flags _ #~'()) + #~(list "PYTHON=true")) ((#:tests? _ #t) #f) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'patch-stuff - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* "grub-core/Makefile.in" - (("/bin/sh") (which "sh"))) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'patch-stuff + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "grub-core/Makefile.in" + (("/bin/sh") + (which "sh"))) - ;; Make the font visible. - (copy-file (assoc-ref (or native-inputs inputs) - "unifont") - "unifont.bdf.gz") - (system* "gunzip" "unifont.bdf.gz") - - #t)))))))) + ;; Make the font visible. + (copy-file #+unifont "unifont.bdf.gz") + (system* "gunzip" "unifont.bdf.gz"))))))))) (define-public grub-coreboot (package @@ -311,66 +308,62 @@ (define-public grub-coreboot (name "grub-coreboot") (synopsis "GRand Unified Boot loader (Coreboot payload version)") (arguments - `(,@(substitute-keyword-arguments (package-arguments grub) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'disable-broken-tests - (lambda _ - (setenv "DISABLE_HARD_ERRORS" "1") - (setenv - "XFAIL_TESTS" - (string-join - ;; TODO: All the tests below use grub shell - ;; (tests/util/grub-shell.in), and here grub-shell uses - ;; QEMU and a Coreboot image to run the tests. Since we - ;; don't have a Coreboot package in Guix yet these tests - ;; are disabled. See the Guix bug #64667 for more details - ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667). - (list - "pata_test" - "ahci_test" - "uhci_test" - "ehci_test" - "example_grub_script_test" - "ohci_test" - "grub_script_eval" - "grub_script_echo1" - "grub_script_test" - "grub_script_leading_whitespace" - "grub_script_echo_keywords" - "grub_script_vars1" - "grub_script_for1" - "grub_script_while1" - "grub_script_if" - "grub_script_comments" - "grub_script_functions" - "grub_script_continue" - "grub_script_break" - "grub_script_shift" - "grub_script_blockarg" - "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" - "grub_script_gettext" - "grub_script_escape_comma" - "help_test" - "grub_script_strcmp" - "test_sha512sum" - "grub_cmd_tr" - "test_unset" - "file_filter_test") - " ")))))) - ((#:configure-flags flags - ''()) - `(cons* "--with-platform=coreboot" - ,flags))))))) + (substitute-keyword-arguments (package-arguments grub) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'check 'disable-broken-tests + (lambda _ + (setenv "DISABLE_HARD_ERRORS" "1") + (setenv "XFAIL_TESTS" + (string-join + ;; TODO: All the tests below use grub shell + ;; (tests/util/grub-shell.in), and here grub-shell uses + ;; QEMU and a Coreboot image to run the tests. Since we + ;; don't have a Coreboot package in Guix yet these tests + ;; are disabled. See the Guix bug #64667 for more details + ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667). + (list "pata_test" + "ahci_test" + "uhci_test" + "ehci_test" + "example_grub_script_test" + "ohci_test" + "grub_script_eval" + "grub_script_echo1" + "grub_script_test" + "grub_script_leading_whitespace" + "grub_script_echo_keywords" + "grub_script_vars1" + "grub_script_for1" + "grub_script_while1" + "grub_script_if" + "grub_script_comments" + "grub_script_functions" + "grub_script_continue" + "grub_script_break" + "grub_script_shift" + "grub_script_blockarg" + "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" + "grub_script_gettext" + "grub_script_escape_comma" + "help_test" + "grub_script_strcmp" + "test_sha512sum" + "grub_cmd_tr" + "test_unset" + "file_filter_test") + " ")))))) + ((#:configure-flags flags #~'()) + #~(cons* "--with-platform=coreboot" #$flags)))))) (define-public grub-efi (package @@ -385,39 +378,38 @@ (define-public grub-efi (modify-inputs (package-native-inputs grub) (delete "parted" "qemu" "xorriso"))) (arguments - `(;; TODO: Tests need a UEFI firmware for qemu. There is one at - ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg . - ;; Search for 'OVMF' in "tests/util/grub-shell.in". - ,@(substitute-keyword-arguments (package-arguments grub) - ((#:tests? _ #f) #f) - ((#:configure-flags flags ''()) - `(cons* "--with-platform=efi" - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '("--enable-stack-protector") ; EFI-only for now - '()) - ,flags)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'patch-stuff 'use-absolute-efibootmgr-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "grub-core/osdep/unix/platform.c" - (("efibootmgr") - (search-input-file inputs - "/sbin/efibootmgr"))))) - (add-after 'patch-stuff 'use-absolute-mtools-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((mtools (assoc-ref inputs "mtools"))) - (substitute* "util/grub-mkrescue.c" - (("\"mformat\"") - (string-append "\"" mtools - "/bin/mformat\""))) - (substitute* "util/grub-mkrescue.c" - (("\"mcopy\"") - (string-append "\"" mtools - "/bin/mcopy\""))) - #t)))))))))) + ;; TODO: Tests need a UEFI firmware for qemu. There is one at + ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg . + ;; Search for 'OVMF' in "tests/util/grub-shell.in". + (substitute-keyword-arguments (package-arguments grub) + ((#:tests? _ #f) #f) + ((#:configure-flags flags #~'()) + #~(cons* "--with-platform=efi" + #$@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + #~("--enable-stack-protector") ;EFI-only for now + #~()) + #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'patch-stuff 'use-absolute-efibootmgr-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "grub-core/osdep/unix/platform.c" + (("efibootmgr") + (search-input-file inputs "/sbin/efibootmgr"))))) + (add-after 'patch-stuff 'use-absolute-mtools-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "util/grub-mkrescue.c" + (("\"mformat\"") + (string-append "\"" + (search-input-file inputs "/bin/mformat") + "\""))) + (substitute* "util/grub-mkrescue.c" + (("\"mcopy\"") + (string-append "\"" + (search-input-file inputs "/bin/mcopy") + "\""))))))))))) (define-public grub-efi32 (package @@ -425,17 +417,19 @@ (define-public grub-efi32 (name "grub-efi32") (synopsis "GRand Unified Boot loader (UEFI 32bit version)") (arguments - `(,@(substitute-keyword-arguments (package-arguments grub-efi) - ((#:configure-flags flags ''()) - `(cons* - ,@(cond ((target-x86?) '("--target=i386")) - ((target-aarch64?) - (list "--target=arm" - (string-append "TARGET_CC=" - (cc-for-target "arm-linux-gnueabihf")))) - ((target-arm?) '("--target=arm")) - (else '())) - ,flags))))) + (substitute-keyword-arguments (package-arguments grub-efi) + ((#:configure-flags flags #~'()) + #~(cons* #$@(cond ((target-x86?) + #~("--target=i386")) + ((target-aarch64?) + #~("--target=arm" + (string-append "TARGET_CC=" + #$(cc-for-target + "arm-linux-gnueabihf")))) + ((target-arm?) + #~("--target=arm")) + (else #~())) + #$flags)))) (native-inputs (if (target-aarch64?) (modify-inputs (package-native-inputs grub-efi) @@ -459,24 +453,26 @@ (define-public grub-hybrid (prepend grub))) (arguments (substitute-keyword-arguments (package-arguments grub-efi) - ((#:modules modules `((guix build utils) (guix build gnu-build-system))) + ((#:modules modules `((guix build utils) + (guix build gnu-build-system))) `((ice-9 ftw) ,@modules)) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'install-non-efi - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((input-dir (search-input-directory inputs - "/lib/grub")) - (output-dir (string-append (assoc-ref outputs "out") - "/lib/grub"))) - (for-each - (lambda (basename) - (if (not (or (string-prefix? "." basename) - (file-exists? (string-append output-dir "/" basename)))) - (symlink (string-append input-dir "/" basename) - (string-append output-dir "/" basename)))) - (scandir input-dir)) - #t))))))))) + #~(modify-phases #$phases + (add-after 'install 'install-non-efi + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((input-dir (search-input-directory inputs "/lib/grub")) + (output-dir (string-append (assoc-ref outputs "out") + "/lib/grub"))) + (for-each (lambda (basename) + (unless (or (string-prefix? "." basename) + (file-exists? (string-append + output-dir "/" + basename))) + (symlink (string-append input-dir "/" + basename) + (string-append output-dir "/" + basename)))) + (scandir input-dir))))))))))) (define-public (make-grub-efi-netboot name subdir) "Make a grub-efi-netboot package named NAME, which will be able to boot over -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 08 21:49:00 2024 Received: (at 71348) by debbugs.gnu.org; 9 Jun 2024 01:49:00 +0000 Received: from localhost ([127.0.0.1]:54662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sG7g3-0006Sm-Qv for submit@debbugs.gnu.org; Sat, 08 Jun 2024 21:49:00 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:60863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sG7g1-0006SQ-N2 for 71348@debbugs.gnu.org; Sat, 08 Jun 2024 21:48:58 -0400 Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7954f8b818fso90235485a.1 for <71348@debbugs.gnu.org>; Sat, 08 Jun 2024 18:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717897656; x=1718502456; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AwIXEABuZsP2dK6O/au2/sKs8hI4LfViudh0y9DddHE=; b=bBw9WONeP7XX5c6wj+Gk4/VbfFgbziuQRliQ4tImYFO/MBd7VxYiQRav+ca8fOGk6Y q2mmZXcX56XTw7hWEGfjJAfNmtRyKhisbySlfAmTKx/0pkxxfKTiLO5Bs26oV84+llMx 6qNxxDTWWQdFDNrIajrp+QxpD2JwpuapzLy56BGnXGYmzwj/4+/j45mkg5UopqNHvSbF RlwRFsfOmktu05/hlseBlA7Uuhp9qynJ6mNtw3ubNr/w5BObTRLYwXpnA8x+X+alwnz+ 68yEPkn+XAm62nk0I1JXOOFv7TMHnhKpmVtF37rDzBD6xMpCUMGRuecjDO/d/9kEolPM 3orw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717897656; x=1718502456; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AwIXEABuZsP2dK6O/au2/sKs8hI4LfViudh0y9DddHE=; b=AoksRTIbuRg1WxwQ+gbQ8lCpOeQHEvRsW8zWYrx363D5A4DX/KVU0O+0pv60645yMW OHS8yddIoIkS7864nCZi9YbjW048++YdUheNgkQzqD7/LP/f3ypmpmtp896fSKNBYu6N L7S9Qna34gOFOJjkjcaDvAj9ucmonLRDJ5QoOyAtLwSz+3QMcJSGPOH24Xvv2TzvAggx U+Ly6HaWH2MLgcs6m7gPKPX4+Log7OdM1GAsnn3exRuKwueUulLCkuGWBExK/7wpA5xV fBO9ExB2Od0wOO8hyKmhg9QktsKPXtPhulSboJlTICd1zhWD1dUagU88WyMDsJrPpjCH fV3Q== X-Gm-Message-State: AOJu0YwSsIhT8dMys/DOTqdST1/NIi5dHj0jE+72xTO3ZKn97ypauiIl kHRJoR55IJ+cPUaAaeFUFS1DdHjSAnH/nZDqpD2yanNg577HpJP/ X-Google-Smtp-Source: AGHT+IGoBIdmrFUqN+6r1nererfVk7KGjkNnBVNk7A5mJkqqg5DC06CB/2UWk/tx+WVLS3aSGaajyA== X-Received: by 2002:a05:620a:24d2:b0:795:5d04:754b with SMTP id af79cd13be357-7955d0479d2mr131906285a.59.1717897655640; Sat, 08 Jun 2024 18:47:35 -0700 (PDT) Received: from hurd (dsl-10-131-213.b2b2c.ca. [72.10.131.213]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79532821301sm299232185a.6.2024.06.08.18.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 18:47:35 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#71348] [PATCH 0/2] Update GRUB to 2.12 In-Reply-To: ("Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s=22's?= message of "Mon, 3 Jun 2024 21:21:12 +0200") References: Date: Sat, 08 Jun 2024 21:47:33 -0400 Message-ID: <87cyoqzy2y.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71348 Cc: Vagrant Cascadian , Ada Stevenson , 71348@debbugs.gnu.org, Efraim Flashner , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, +CC Josselin, who also had a GRUB 2.12 patch somewhere (can't find it) Ludovic Court=C3=A8s writes: > Hello Guix! > > Following the discussion with Ada Stevenson=C2=B9 who reported that > the e2fsprogs upgrade to 1.47.0 broke system installation, here > is an upgrade of GRUB. > > I tested it on x86_64-linux with: > > ./pre-inst-env guix build grub-efi{,32} grub-coreboot grub-hybrid grub{= ,-minimal} That's a welcome update. I believe it'll fix our LUKS2 issues and we could do without mentioning the caveats in the manual, like so: --8<---------------cut here---------------start------------->8--- modified doc/guix.texi @@ -2384,21 +2384,12 @@ Keyboard Layout and Networking and Partitioning @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information). =20 -@quotation Warning -While efforts are in progress to extend support to LUKS2, please note -that Guix only supports devices of type LUKS1 at the moment. You can -verify that your existing LUKS device is of the right type by running -@command{cryptsetup luksDump @var{device}}. Alternatively, you can -create a new LUKS1 device with @command{cryptsetup luksFormat --type -luks1 @var{device}}. -@end quotation - Assuming you want to store the root partition on @file{/dev/sda2}, the -command sequence to format it as a LUKS1 partition would be along these +command sequence to format it as a LUKS partition would be along these lines: =20 @example -cryptsetup luksFormat --type luks1 /dev/sda2 +cryptsetup luksFormat /dev/sda2 cryptsetup open /dev/sda2 my-partition mkfs.ext4 -L my-root /dev/mapper/my-partition @end example --8<---------------cut here---------------end--------------->8--- Reviewed-by: Maxim Cournoyer --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 22:52:22 2024 Received: (at 71348) by debbugs.gnu.org; 24 Jun 2024 02:52:22 +0000 Received: from localhost ([127.0.0.1]:34783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLZob-00051n-K9 for submit@debbugs.gnu.org; Sun, 23 Jun 2024 22:52:21 -0400 Received: from mail-qv1-f45.google.com ([209.85.219.45]:57618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLZoa-00051L-04; Sun, 23 Jun 2024 22:52:20 -0400 Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6b5052defa6so19566736d6.3; Sun, 23 Jun 2024 19:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719197473; x=1719802273; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yL03WWY3WuIIl9O2WNz7fp3ydLBpdE3jKkk0CJrjLwk=; b=T+Su9VOYoE+D3n5sO4JQwDXczSUK9WusNjvxItmMZctdgVr/4Y2sGeEIckD0P1BtGo iVpjYuirT5pKIIMUw3W+colsI8TWgxOjvRgGQ30ekjtQSXJX8hqAwwuHk6oGw6hwAeji cKAzT7q7s0RrqeXYwy7dO9Zpr/VngDU4bbXq38ntItMIHNk4E8Lg98S7wQU0FbpFbAJu 2lCEKNNHzkqMCMMJN7Xs+QDRS/pYfw99i67t8fd8K3ZRN8Mbro8ucsKZ/M6l5NSdH/sj V6ZNkZrvWd/AIAUSerjwhgKEl59M8xUvx/EnaWxZ5TBwQ8uK25c23MrfM9InioXkxy2p zBaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719197473; x=1719802273; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yL03WWY3WuIIl9O2WNz7fp3ydLBpdE3jKkk0CJrjLwk=; b=DbY1VkBVW4BIyjg98VgltPVypgeNO52O2JziEeUw5xpfX+Q9qfENSyPOQuMrie/JES CDVYAG2RqtHhYnFfGBaL7zAfH90tO140csRB/3i/yf9lKpIdVfzlCo2NyzDDtpEjnNdP 7/9sUnnZm9ok/eGVDX/03xKxT+A4MLHxqOO6A+K9qJiWPG0tGrkLnm+mfKVcqKl2AA8W kx0+n038SnuDLJTNBD9yCswvpWrK/QIGA1zLUln0NofHIyeVzlVWGBlhxKgCUyuw6blp beolLhoPba6wqQtaJ+dhloI41aZ+PU0g2f9S4FJRCvW4HwXHK2Rf3XlSgKlxgiJHeUbV glUQ== X-Forwarded-Encrypted: i=1; AJvYcCWXCyN9pBZZuuoAJrQ/WNXnwkGCIsEclOfOCma61nvRGpahLn9WCfJ6uHeIUAadZVmSfnXqzalGEy/sk2YMDApSqODwsi4= X-Gm-Message-State: AOJu0Yw2k7E6A8wjt3uPUre08our/TSW8TRNMfxI4lJFpmKrkF+es6Z1 Ngr+o8ao/v4CoxUUKUE/1Ujz2UkxkFwR4642R7FyHc98C2jyD1+7 X-Google-Smtp-Source: AGHT+IGcbXf5KEameL6JigwyE75WZYb13OwOk20kWOL3x0JX5fyqvldf/93xyhtst3rN9uitP8bRGw== X-Received: by 2002:ad4:4dc3:0:b0:6b5:4531:7297 with SMTP id 6a1803df08f44-6b545317a05mr28772956d6.57.1719197473676; Sun, 23 Jun 2024 19:51:13 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b53ca6b93bsm13999716d6.47.2024.06.23.19.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 19:51:13 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#71348] [PATCH 0/2] Update GRUB to 2.12 In-Reply-To: <87cyoqzy2y.fsf@gmail.com> (Maxim Cournoyer's message of "Sat, 08 Jun 2024 21:47:33 -0400") References: <87cyoqzy2y.fsf@gmail.com> Date: Sun, 23 Jun 2024 22:51:11 -0400 Message-ID: <877cef6okg.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71348 Cc: Josselin Poiret , 71348@debbugs.gnu.org, Vagrant Cascadian , Efraim Flashner , Ada Stevenson , 71348-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > Hi Ludovic, > > +CC Josselin, who also had a GRUB 2.12 patch somewhere (can't find it) > > Ludovic Court=C3=A8s writes: > >> Hello Guix! >> >> Following the discussion with Ada Stevenson=C2=B9 who reported that >> the e2fsprogs upgrade to 1.47.0 broke system installation, here >> is an upgrade of GRUB. >> >> I tested it on x86_64-linux with: >> >> ./pre-inst-env guix build grub-efi{,32} grub-coreboot grub-hybrid grub= {,-minimal} > > That's a welcome update. I believe it'll fix our LUKS2 issues and we > could do without mentioning the caveats in the manual, like so: > > modified doc/guix.texi > @@ -2384,21 +2384,12 @@ Keyboard Layout and Networking and Partitioning > @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, > @code{man cryptsetup}} for more information). >=20=20 > -@quotation Warning > -While efforts are in progress to extend support to LUKS2, please note > -that Guix only supports devices of type LUKS1 at the moment. You can > -verify that your existing LUKS device is of the right type by running > -@command{cryptsetup luksDump @var{device}}. Alternatively, you can > -create a new LUKS1 device with @command{cryptsetup luksFormat --type > -luks1 @var{device}}. > -@end quotation > - > Assuming you want to store the root partition on @file{/dev/sda2}, the > -command sequence to format it as a LUKS1 partition would be along these > +command sequence to format it as a LUKS partition would be along these > lines: >=20=20 > @example > -cryptsetup luksFormat --type luks1 /dev/sda2 > +cryptsetup luksFormat /dev/sda2 > cryptsetup open /dev/sda2 my-partition > mkfs.ext4 -L my-root /dev/mapper/my-partition > @end example > > Reviewed-by: Maxim Cournoyer I've now applied this with the above. Closing! --=20 Thanks, Maxim From unknown Thu Aug 14 18:36:40 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 22 Jul 2024 11:24:19 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator