diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-06-03 22:01:22 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-06-24 08:51:41 -0400 |
| commit | e6facbe069ba536a6bb9dffc582a78f982596be6 (patch) | |
| tree | fe50d17f9fd9ec810202f00bf443d8c5896f6d38 /gnu/packages/bootloaders.scm | |
| parent | d37614bed19891d322a305d02be61da8aacc0492 (diff) | |
| download | guix-patches-e6facbe069ba536a6bb9dffc582a78f982596be6.tar guix-patches-e6facbe069ba536a6bb9dffc582a78f982596be6.tar.gz | |
gnu: grub: Update to 2.12.
* 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’.
* doc/guix.texi (Keyboard Layout and Networking and Partitioning): Update
accordingly (it should now be fine to use LUKS2).
* gnu/packages/patches/grub-ignore-metadata-csum-seed.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove it.
Change-Id: Ia31b3b7e0a2e7de42d30229733e9c196fcd12fd9
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f37344c25b..4e932ee328 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 <ludo@gnu.org> +;;; Copyright © 2013-2019, 2021, 2023-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> @@ -104,25 +104,28 @@ (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 @@ menu to select one of the installed operating systems.") "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" |