I am getting tired of this

Signed-off-by: Peter Jones <pjones@redhat.com>

0210-make-better-backtraces.patch

@@ -1,4 +1,4 @@
-From fe56f63c69beec5448db49884b389ff3392fcf7c Mon Sep 17 00:00:00 2001
+From 1954221a4b99a4f83500b4a52e41e68b7ca7c4cc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 6 Nov 2017 18:31:56 -0500
 Subject: [PATCH 210/216] make better backtraces
@@ -354,7 +354,7 @@ index 621070918d4..5028d157c46 100644
         i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
 diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c
 new file mode 100644
-index 00000000000..60a6abfe93f
+index 00000000000..f3bb839e1d7
 --- /dev/null
 +++ b/grub-core/kern/i386/backtrace.c
 @@ -0,0 +1,120 @@
@@ -463,7 +463,7 @@ index 00000000000..60a6abfe93f
 +  skip += 1;
 +#if defined (__x86_64__)
 +  asm volatile ("movq %%rbp, %%rdi\n"
-+		"movq %0, %%rsi\n"
++		"movl %0, %%rsi\n"
 +		"call " EXT_C("grub_backtrace_pointer")
 +		:
 +		: "r" (skip));

0211-normal-don-t-draw-our-startup-message-if-debug-is-se.patch

@@ -1,4 +1,4 @@
-From 93b1871dd0f46bceb148fd8fd5664fe994ec3d8b Mon Sep 17 00:00:00 2001
+From 82ae897af2691f21f500fb7bbee11263159236f0 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 9 Nov 2017 15:58:52 -0500
 Subject: [PATCH 211/216] normal: don't draw our startup message if debug is

0212-Work-around-some-minor-include-path-weirdnesses.patch

@@ -1,4 +1,4 @@
-From e7a35bd7770d0dff0130c49522bafa7ce767972e Mon Sep 17 00:00:00 2001
+From dcf64d8da777158cf00dec1b663f436f3b6bed9b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 16 Mar 2018 13:28:57 -0400
 Subject: [PATCH 212/216] Work around some minor include path weirdnesses

0213-Make-it-possible-to-enabled-build-id-sha1.patch

@@ -1,4 +1,4 @@
-From 243bd5d756c6dd91f77dea538310b5387f5628a5 Mon Sep 17 00:00:00 2001
+From cdf3041c33ca079b254f24c0e9262abe1efe0a57 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 25 Jun 2015 15:41:06 -0400
 Subject: [PATCH 213/216] Make it possible to enabled --build-id=sha1

0214-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch

@@ -1,4 +1,4 @@
-From 62ba456cc91cbc31ab16a075057459f71bb73524 Mon Sep 17 00:00:00 2001
+From d94879fe76b6b8199afda00c76eafcce4769e1ba Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Sun, 28 Jun 2015 13:09:58 -0400
 Subject: [PATCH 214/216] Add grub_qdprintf() - grub_dprintf() without the

0215-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch

@@ -1,4 +1,4 @@
-From eb632ed489ac2418f3386f7693a01e1863843c53 Mon Sep 17 00:00:00 2001
+From 0f79e0c4c498ea5b92e5475cb8845d48369b2169 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 25 Jun 2015 15:11:36 -0400
 Subject: [PATCH 215/216] Make a "gdb" dprintf that tells us load addresses.

0216-static.patch

@@ -1,57 +0,0 @@
-From 3fa7a272a55df6ac6fe0108ee1d47b4f7a4d6456 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 16 Mar 2018 14:59:21 -0400
-Subject: [PATCH 216/216] static
-
----
- util/grub-mkconfig_lib.in | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 70dc8d57e92..693340f6912 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -128,6 +128,40 @@ EOF
-   fi
- }
- 
-+add_device_modules ()
-+{
-+  local device=$1 && shift
-+
-+  old_ifs="$IFS"
-+  IFS='
-+'
-+  partmap="`"${grub_probe}" --device ${device} --target=partmap`"
-+  for module in ${partmap} ; do
-+    case "${module}" in
-+      netbsd | openbsd)
-+        echo "insmod part_bsd";;
-+      *)
-+        echo "insmod part_${module}";;
-+    esac
-+  done
-+
-+  # Abstraction modules aren't auto-loaded.
-+  abstraction="`"${grub_probe}" --device ${device} --target=abstraction`"
-+  for module in ${abstraction} ; do
-+    echo "insmod ${module}"
-+  done
-+
-+  fs="`"${grub_probe}" --device ${device} --target=fs`"
-+  for module in ${fs} ; do
-+    echo "insmod ${module}"
-+  done
-+}
-+
-+get_device_uuid ()
-+{
-+
-+}
-+
- prepare_grub_to_access_device ()
- {
-   local device=$1 && shift
--- 
-2.15.0
-

grub.patches

@@ -213,4 +213,3 @@ Patch0212: 0212-Work-around-some-minor-include-path-weirdnesses.patch
 Patch0213: 0213-Make-it-possible-to-enabled-build-id-sha1.patch
 Patch0214: 0214-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
 Patch0215: 0215-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
-Patch0216: 0216-static.patch