aboutsummaryrefslogtreecommitdiff
path: root/getgrub
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-02-14 01:46:47 +0000
committerFrancis Rowe <info@gluglug.org.uk>2015-02-14 01:46:47 +0000
commitdfbcec9d8674fe04521d3626e9245efcb41772ac (patch)
tree4c991a134ec1b26973053790540d6375fccd73e9 /getgrub
parent591ed8ec39fa7da2fbbcdf374232107bbdd5ff08 (diff)
downloadlibrebootfr-dfbcec9d8674fe04521d3626e9245efcb41772ac.tar.gz
librebootfr-dfbcec9d8674fe04521d3626e9245efcb41772ac.zip
getgrub: Update GRUB
Also, use "git am" instead of "git apply"
Diffstat (limited to 'getgrub')
-rwxr-xr-xgetgrub7
1 files changed, 2 insertions, 5 deletions
diff --git a/getgrub b/getgrub
index b70a7840..709fe997 100755
--- a/getgrub
+++ b/getgrub
@@ -41,16 +41,13 @@ cd grub
# Reset to the last commit that was tested
# --------------------------------------------------------------------------------
-git reset --hard bac5d1a64ab4191058a8fd4c05f6b3b339e249e7
+git reset --hard 32cd33bd19348afb77ab849846e0b6d6157ea308
# Apply patches
# --------------------------------------------------------------------------------
-# See resources/grub/patch/gitdiff
# Replace "GNU GRUB version" in GRUB screen with "FREE AS IN FREEDOM"
-
-# copy it from resources
-git apply ../resources/grub/patch/gitdiff
+git am "../resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch"
cd ../
echo "FINISHED DOWNLOADING GRUB"