From f398fb425bed2ca23f8fb9e1da987186816317b8e9c7670ee73ab0c8b9acbe87 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 1 Sep 2016 12:01:21 +0000
Subject: [PATCH] Accepting request 424108 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/424108
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=143
---
 grub2-accept-empty-module.patch | 20 ++++++++++++++++++++
 grub2.changes                   |  6 ++++++
 grub2.spec                      |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 grub2-accept-empty-module.patch

diff --git a/grub2-accept-empty-module.patch b/grub2-accept-empty-module.patch
new file mode 100644
index 0000000..2cb5763
--- /dev/null
+++ b/grub2-accept-empty-module.patch
@@ -0,0 +1,20 @@
+Accept empty modules
+
+For the Xen platform the all_video.mod module is empty.
+With old binutils the .symtab section remained (containing
+only section symbols), so the check didn't trigger, but starting
+with binutils 2.27 not even a .symtab remains.  As there are
+also no relocations that's no problem (and that is checked
+independendly).
+--- grub-2.02~beta3/util/grub-module-verifierXX.c.mm	2016-02-11 10:57:41.000000000 +0000
++++ grub-2.02~beta3/util/grub-module-verifierXX.c	2016-08-31 15:26:36.000000000 +0000
+@@ -199,7 +199,8 @@ check_symbols (const struct grub_module_
+       Elf_Shdr *s = find_section (arch, e, ".moddeps");
+ 
+       if (!s)
+-	grub_util_error ("no symbol table and no .moddeps section");
++	/*grub_util_error ("no symbol table and no .moddeps section");*/
++	return; /* An empty module happens for all_video.module for Xen */
+ 
+       if (!s->sh_size)
+ 	grub_util_error ("no symbol table and empty .moddeps section");
diff --git a/grub2.changes b/grub2.changes
index 5e3360f..23b8145 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 31 15:40:28 UTC 2016 - matz@suse.com
+
+- binutils 2.27 creates empty modules without a symtab.
+  Add patch grub2-accept-empty-module.patch to not reject them.
+
 -------------------------------------------------------------------
 Sat Aug 20 05:42:12 UTC 2016 - arvidjaar@gmail.com
 
diff --git a/grub2.spec b/grub2.spec
index 5e88886..8b75c8c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -185,6 +185,7 @@ Patch70:        grub2-default-distributor.patch
 Patch71:        grub2-menu-unrestricted.patch
 Patch72:        grub2-mkconfig-arm.patch
 Patch73:        0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
+Patch74:        grub2-accept-empty-module.patch
 # Btrfs snapshot booting related patches
 Patch101:       grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:       grub2-btrfs-02-export-subvolume-envvars.patch
@@ -424,6 +425,7 @@ swap partition while in resuming
 %patch71 -p1
 %patch72 -p1
 %patch73 -p1
+%patch74 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1