summaryrefslogtreecommitdiffstats
path: root/resources/grub
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-02-13 20:46:47 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-02-13 20:46:47 (EST)
commitdfbcec9d8674fe04521d3626e9245efcb41772ac (patch)
tree4c991a134ec1b26973053790540d6375fccd73e9 /resources/grub
parent591ed8ec39fa7da2fbbcdf374232107bbdd5ff08 (diff)
downloadlibreboot-dfbcec9d8674fe04521d3626e9245efcb41772ac.zip
libreboot-dfbcec9d8674fe04521d3626e9245efcb41772ac.tar.gz
libreboot-dfbcec9d8674fe04521d3626e9245efcb41772ac.tar.bz2
getgrub: Update GRUB
Also, use "git am" instead of "git apply"
Diffstat (limited to 'resources/grub')
-rw-r--r--resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch26
-rw-r--r--resources/grub/patch/COPYING2
-rw-r--r--resources/grub/patch/gitdiff13
3 files changed, 26 insertions, 15 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
new file mode 100644
index 0000000..a3b10d4
--- /dev/null
+++ b/resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch
@@ -0,0 +1,26 @@
+From f56cc3dc534db469905a4ff33a40e18b4481876e 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] grub-core/normal/main.c: Display "FREE AS IN FREEDOM", not
+ version
+
+---
+ grub-core/normal/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 623b93b..659e241 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -208,7 +208,7 @@ grub_normal_init_page (struct grub_term_output *term,
+
+ grub_term_cls (term);
+
+- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
++ msg_formatted = grub_xasprintf("FREE AS IN FREEDOM");
+ if (!msg_formatted)
+ return;
+
+--
+1.9.1
+
diff --git a/resources/grub/patch/COPYING b/resources/grub/patch/COPYING
deleted file mode 100644
index 0a7d397..0000000
--- a/resources/grub/patch/COPYING
+++ /dev/null
@@ -1,2 +0,0 @@
-The "gifdiff" file is a patch for the GRUB project.
-Look at that project's copyright information to see what conditions apply.
diff --git a/resources/grub/patch/gitdiff b/resources/grub/patch/gitdiff
deleted file mode 100644
index cb5681d..0000000
--- a/resources/grub/patch/gitdiff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 3a926fc..6d48c6a 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -208,7 +208,7 @@ grub_normal_init_page (struct grub_term_output *term,
-
- grub_term_cls (term);
-
-- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
-+ msg_formatted = grub_xasprintf("FREE AS IN FREEDOM");
- if (!msg_formatted)
- return;
-