aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-10-14 03:00:00 +0100
committerFrancis Rowe <info@gluglug.org.uk>2014-10-14 03:00:00 +0100
commit11c5438cddd8b7bbe603fe73373d6d3dd33e0eb0 (patch)
tree1db9bd39146c3cbb1daf2275d0e653a62e0e27be
parent6d5c1ec0827a097e533747d0b5aec970c344af82 (diff)
downloadlibrebootfr-11c5438cddd8b7bbe603fe73373d6d3dd33e0eb0.tar.gz
librebootfr-11c5438cddd8b7bbe603fe73373d6d3dd33e0eb0.zip
Update GRUB
-rwxr-xr-xgetgrub22
1 files changed, 2 insertions, 20 deletions
diff --git a/getgrub b/getgrub
index 39a170ab..884b36c3 100755
--- a/getgrub
+++ b/getgrub
@@ -39,17 +39,7 @@ cd grub
# Reset to the last commit that was tested
# --------------------------------------------------------------------------------
-# Commit ID used (see "git log"):
-#
-# commit 4b8b9135f1676924a8458da528d264bbc7bbb301
-# Author: Vladimir Serbinenko <phcoder@gmail.com>
-# Date: Sun Apr 20 16:12:41 2014 +0200
-#
-# * grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.
-#
-# Reported by: Yves Blusseau <blusseau@zetam.org>.
-
-git reset --hard 4b8b9135f1676924a8458da528d264bbc7bbb301
+git reset --hard 77063f4cb672f423272db7e21ca448cf3de98dcf
# Apply patches
# --------------------------------------------------------------------------------
@@ -58,17 +48,9 @@ git reset --hard 4b8b9135f1676924a8458da528d264bbc7bbb301
# Replace "GNU GRUB version" in GRUB screen with "FREE AS IN FREEDOM"
# copy it from resources
-cp ../resources/grub/patch/gitdiff .
+git apply ../resources/grub/patch/gitdiff
-# apply it
-git apply gitdiff
-
-# remove the copy (no longer needed)
-rm -rf gitdiff
-
-# we're done
cd ../
-
echo "FINISHED DOWNLOADING GRUB"
# ------------------- DONE ----------------------