Update to GRUB 7f2a856faec951b7ab816880bd26e1e10b17a596

11 files changed, 23 insertions, 23 deletions

diff --git a/resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch b/resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch
index 4523a126..91d55918 100644
--- a/resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch
+++ b/resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch
@@ -1,7 +1,7 @@
-From f93359e10e720673466fa52ac4814619b3bddc06 Mon Sep 17 00:00:00 2001
+From 721f09ef24e1879667ac3469c17774450602b29e Mon Sep 17 00:00:00 2001
 From: Francis Rowe <info@gluglug.org.uk>
 Date: Sat, 14 Feb 2015 01:24:23 +0000
-Subject: [PATCH 01/11] grub-core/normal/main.c: Display "FREE AS IN FREEDOM",
+Subject: [PATCH 01/10] grub-core/normal/main.c: Display "FREE AS IN FREEDOM",
  not version
 
 ---
diff --git a/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch b/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
index 8fdb7b4d..f14241b9 100644
--- a/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
@@ -1,7 +1,7 @@
-From f19bd8a206682a0d8c8c9650b2d4d171a67a9c1f Mon Sep 17 00:00:00 2001
+From 04e079fed3b275b8ba2081c7fbf9acd853ce055b Mon Sep 17 00:00:00 2001
 From: John Lane <john@lane.uk.net>
 Date: Tue, 23 Jun 2015 11:16:30 +0100
-Subject: [PATCH 02/11] Cryptomount support LUKS detached header
+Subject: [PATCH 02/10] Cryptomount support LUKS detached header
 
 ---
  grub-core/disk/cryptodisk.c | 22 ++++++++++++++++++----
diff --git a/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch b/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch
index ef6f1e2e..9c33b9b0 100644
--- a/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch
@@ -1,7 +1,7 @@
-From 641ff2b2aa380c0b9adbc025eb4af3a0217b577b Mon Sep 17 00:00:00 2001
+From 3b7ef4a5fd57b042201fbefb92a217070b944d67 Mon Sep 17 00:00:00 2001
 From: John Lane <john@lane.uk.net>
 Date: Fri, 26 Jun 2015 13:37:10 +0100
-Subject: [PATCH 03/11] Cryptomount support key files
+Subject: [PATCH 03/10] Cryptomount support key files
 
 ---
  grub-core/disk/cryptodisk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-
diff --git a/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch b/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch
index 252f76fb..538f4aef 100644
--- a/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch
@@ -1,7 +1,7 @@
-From b761dd8c48075a285f89ed439a0870879fde6c6e Mon Sep 17 00:00:00 2001
+From f39e8ee5696f15860c73b07e652a8b59fcc834c7 Mon Sep 17 00:00:00 2001
 From: John Lane <john@lane.uk.net>
 Date: Fri, 26 Jun 2015 13:49:58 +0100
-Subject: [PATCH 04/11] Cryptomount luks allow multiple passphrase attempts
+Subject: [PATCH 04/10] Cryptomount luks allow multiple passphrase attempts
 
 ---
  grub-core/disk/luks.c | 278 ++++++++++++++++++++++++++------------------------
diff --git a/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch b/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch
index 77722ba5..54635442 100644
--- a/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch
@@ -1,7 +1,7 @@
-From a20258f8afbb3c9e1b3c6735126e7c720fa2459a Mon Sep 17 00:00:00 2001
+From 632155a6e8923cdd5c1d4e23576cfadcb78ee67b Mon Sep 17 00:00:00 2001
 From: John Lane <john@lane.uk.net>
 Date: Fri, 26 Jun 2015 22:09:52 +0100
-Subject: [PATCH 05/11] Cryptomount support plain dm-crypt
+Subject: [PATCH 05/10] Cryptomount support plain dm-crypt
 
 ---
  grub-core/disk/cryptodisk.c | 298 +++++++++++++++++++++++++++++++++++++++++++-
diff --git a/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch b/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch
index a6ccc07e..2684f062 100644
--- a/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch
@@ -1,7 +1,7 @@
-From 6d9ac49d116325c9d29633002ca204f56e8c57f5 Mon Sep 17 00:00:00 2001
+From 047a5b323de2a0c45a6fe2b6854106830da5f3ae Mon Sep 17 00:00:00 2001
 From: John Lane <john@lane.uk.net>
 Date: Fri, 26 Jun 2015 22:48:03 +0100
-Subject: [PATCH 06/11] Cryptomount support for hyphens in UUID
+Subject: [PATCH 06/10] Cryptomount support for hyphens in UUID
 
 ---
  grub-core/disk/cryptodisk.c | 20 +++++++++++++++++---
diff --git a/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch b/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
index 4ff958c1..b9314e5a 100644
--- a/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
@@ -1,7 +1,7 @@
-From 1d3e995f587369b8de6c4a10fe3a7bb0d6ec6ee1 Mon Sep 17 00:00:00 2001
+From fd72a029d64e0ee9552e4433387ee01f3cb05592 Mon Sep 17 00:00:00 2001
 From: Klemens Nanni <contact@autoboot.org>
 Date: Tue, 15 Sep 2015 16:00:03 +0200
-Subject: [PATCH 07/11] grub-core/disk/cryptodisk.c: Point to const char
+Subject: [PATCH 07/10] grub-core/disk/cryptodisk.c: Point to const char
 
 ---
  grub-core/disk/cryptodisk.c | 2 +-
diff --git a/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch b/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch
index 939512ab..1d537e87 100644
--- a/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch
+++ b/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch
@@ -1,7 +1,7 @@
-From 21ae195006adf67a6c6a0de007e7149e6d3dbcf3 Mon Sep 17 00:00:00 2001
+From 8dde1d7be2dd321a375570b7ff7e22bb01293044 Mon Sep 17 00:00:00 2001
 From: Alexander Couzens <lynxis@fe80.eu>
 Date: Fri, 4 Dec 2015 17:10:42 +0100
-Subject: [PATCH 08/11] mkstandalone: add argument --fixed-time to override
+Subject: [PATCH 08/10] mkstandalone: add argument --fixed-time to override
  mtime of files
 
 mkstandalone adds several files to an archive. Doing this it uses the
diff --git a/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch b/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch
index 3d3ab6ea..0612ade0 100644
--- a/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch
+++ b/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch
@@ -1,7 +1,7 @@
-From 1ad8a4c5d0d6003954d37c4f7eeca0514971f8b4 Mon Sep 17 00:00:00 2001
+From 0f1e1a29d4d019e7b2b1a3ac3db7ca22c75e8d88 Mon Sep 17 00:00:00 2001
 From: Alexander Couzens <lynxis@fe80.eu>
 Date: Fri, 4 Dec 2015 17:10:43 +0100
-Subject: [PATCH 09/11] mkrescue: add argument --fixed-time to get reproducible
+Subject: [PATCH 09/10] mkrescue: add argument --fixed-time to get reproducible
  uuids
 
 The uuid generation is based on the time.
diff --git a/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch b/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch
index 4386f0f0..f06dbfb5 100644
--- a/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch
+++ b/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch
@@ -1,7 +1,7 @@
-From 58d54ff1514d83d9e4f77d4374635b1bf705ed81 Mon Sep 17 00:00:00 2001
+From 57174ed960905be4f9c229bbf3913b25745dbfd9 Mon Sep 17 00:00:00 2001
 From: Alexander Couzens <lynxis@fe80.eu>
 Date: Fri, 4 Dec 2015 17:10:44 +0100
-Subject: [PATCH 10/11] Makefile: use FIXED_TIMESTAMP for mkstandalone if set
+Subject: [PATCH 10/10] Makefile: use FIXED_TIMESTAMP for mkstandalone if set
 
 mkstandalone sets timestamps for files which can be overriden by a fixed_timestamp.
 This makes it possible to build reproducible builds for coreboot.
@@ -13,13 +13,13 @@ make default_payload.elf FIXED_TIMESTAMP=1134242
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 288e621..6c786b7 100644
+index 00a9663..ed7f148 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -411,7 +411,7 @@ bootcheck: $(BOOTCHECKS)
  if COND_i386_coreboot
  default_payload.elf: grub-mkstandalone grub-mkimage FORCE
- 	rm $@
+ 	test -f $@ && rm $@ || true
 -	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
 +	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg $(if $(FIXED_TIMESTAMP),-t $(FIXED_TIMESTAMP))
  endif
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index 880d7ff3..55cc5070 100755
--- a/resources/scripts/helpers/download/grub
+++ b/resources/scripts/helpers/download/grub
@@ -41,7 +41,7 @@ git clone git://git.savannah.gnu.org/grub.git || git clone http://git.savannah.g
 cd "grub/"
 
 # reset to known revision
-git reset --hard e3745f908706c07fa249616255ed993ef5704351
+git reset --hard 7f2a856faec951b7ab816880bd26e1e10b17a596
 
 # Apply patches
 # ------------------------------------------------------------------------------