069ab3bbfd
* gnu/packages/bootloaders.scm (grub): Update to 2.04. [source]: Remove upstreamed patches. [arguments]: Don't require Python. Add a ‘disable-pixel-perfect-test’ phase to skip tests that fail with with our newer Unifont. * gnu/packages/patches/grub-efi-fat-serial-number.patch: Adjust context. * gnu/packages/patches/grub-binutils-compat.patch, gnu/packages/patches/grub-check-error-efibootmgr.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them.
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
Change 'grub-mkrescue' to honor the 'GRUB_FAT_SERIAL_NUMBER'
|
|
environment variable. That way, the caller can specify a fixed
|
|
serial number (instead of the randomly chosen one) to create EFI
|
|
images (the 'efi.img' file) that are reproducible bit-for-bit.
|
|
|
|
Patch by Ludovic Courtès <ludo@gnu.org>.
|
|
Mangled (for GRUB 2.04) by Tobias Geerinckx-Rice <me@tobias.gr>.
|
|
|
|
--- grub-2.04/util/grub-mkrescue.c 2019-05-20 13:01:11.000000000 +0200
|
|
+++ grub-2.04/util/grub-mkrescue.c 2019-07-08 23:57:36.912104652 +0200
|
|
@@ -809,8 +809,15 @@
|
|
free (efidir_efi_boot);
|
|
|
|
efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img");
|
|
- rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
|
|
- efiimgfat, "::", NULL });
|
|
+
|
|
+ const char *fat_serial_number = getenv ("GRUB_FAT_SERIAL_NUMBER");
|
|
+ const char *mformat_args[] =
|
|
+ { "mformat", "-C", "-f", "2880", "-L", "16",
|
|
+ fat_serial_number != NULL ? "-N" : "-C",
|
|
+ fat_serial_number != NULL ? fat_serial_number : "-C",
|
|
+ "-i", efiimgfat, "::", NULL };
|
|
+
|
|
+ rv = grub_util_exec (mformat_args);
|
|
if (rv != 0)
|
|
grub_util_error ("`%s` invocation failed\n", "mformat");
|
|
rv = grub_util_exec ((const char * []) { "mcopy", "-s", "-i", efiimgfat, efidir_efi, "::/", NULL });
|