aboutsummaryrefslogtreecommitdiff
path: root/resources/scripts/helpers/download/grub
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa@rosenzweig.io>2017-06-01 00:34:38 +0000
committerGogs <gogitservice@gmail.com>2017-06-01 00:34:38 +0000
commit6d272ca425c10385e540781aa7208416559a46f5 (patch)
tree2e4399b205406529b152139f208ed30c1729fda9 /resources/scripts/helpers/download/grub
parentf52e2a5172f78fc8d3d9b7ec1e228f414fe443b0 (diff)
parente8e19e88869ecdcbb3afbdcdb17bb5bac819a58f (diff)
downloadlibrebootfr-6d272ca425c10385e540781aa7208416559a46f5.tar.gz
librebootfr-6d272ca425c10385e540781aa7208416559a46f5.zip
Merge branch 'payloads/x86/updates-20170430' of libreboot/libreboot into master
Diffstat (limited to 'resources/scripts/helpers/download/grub')
-rwxr-xr-xresources/scripts/helpers/download/grub16
1 files changed, 1 insertions, 15 deletions
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index d0d42817..1847de9a 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 7f2a856faec951b7ab816880bd26e1e10b17a596
+git reset --hard e54c99aaff5e5f6f5d3b06028506c57e66d8ef77
# Apply patches
# ------------------------------------------------------------------------------
@@ -49,20 +49,6 @@ git reset --hard 7f2a856faec951b7ab816880bd26e1e10b17a596
# Replace "GNU GRUB version" in GRUB screen with "FREE AS IN FREEDOM"
git am "../resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch"
-# GRUB enhancement patches from grub.johnlane.ie (rebased in libreboot's GRUB, unofficially, on 30 November 2015)
-git am "../resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch"
-git am "../resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch"
-git am "../resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch"
-git am "../resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch"
-git am "../resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch"
-# hotfix from kl3 (merged from autoboot) (ditto)
-git am "../resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch"
-
-# Needed for reproducible builds in GRUB
-git am "../resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch"
-git am "../resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch"
-git am "../resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch"
-
cd "../"
# Also download SeaBIOS, which we use with GRUB, to implement SeaGRUB