From a0bd705957e5d07586564fda6849fa67e765bc0b Mon Sep 17 00:00:00 2001
From: Gang Wei <gang.wei@intel.com>
Date: Tue, 2 Apr 2013 06:43:24 -0400
Subject: [PATCH] Fix for breaking grub2-mkconfig operation(#929384)

---
 tboot-1.7.3-grub-fix.patch | 33 +++++++++++++++++++++++++++++++++
 tboot.spec                 |  7 ++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tboot-1.7.3-grub-fix.patch

diff --git a/tboot-1.7.3-grub-fix.patch b/tboot-1.7.3-grub-fix.patch
new file mode 100644
index 0000000..922cb01
--- /dev/null
+++ b/tboot-1.7.3-grub-fix.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Gang Wei <gang.wei@intel.com>
+# Date 1364897853 -28800
+# Node ID 7e8dd5f8b1cd672b6cc876727984dd9cc4077c0e
+# Parent  984468adc8fbbf086fac1cfcd97e62bdf3195e39
+Fix possible empty submenu block in generated grub.cfg
+
+Signed-off-by: Gang Wei <gang.wei@intel.com>
+
+diff -r 984468adc8fb -r 7e8dd5f8b1cd tboot/20_linux_tboot
+--- a/tboot/20_linux_tboot	Fri Mar 29 12:48:06 2013 +0800
++++ b/tboot/20_linux_tboot	Tue Apr 02 18:17:33 2013 +0800
+@@ -127,7 +127,7 @@
+       done`
+ prepare_boot_cache=
+ 
+-while [ "x${tboot_list}" != "x" ] ; do
++while [ "x${tboot_list}" != "x" ] && [ "x$linux_list" != "x" ] ; do
+     list="${linux_list}"
+     current_tboot=`version_find_latest $tboot_list`
+     tboot_basename=`basename ${current_tboot}`
+diff -r 984468adc8fb -r 7e8dd5f8b1cd tboot/20_linux_xen_tboot
+--- a/tboot/20_linux_xen_tboot	Fri Mar 29 12:48:06 2013 +0800
++++ b/tboot/20_linux_xen_tboot	Tue Apr 02 18:17:33 2013 +0800
+@@ -171,7 +171,7 @@
+     rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
+     xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"`
+     tlist="${tboot_list}"
+-    while [ "x${tlist}" != "x" ] ; do
++    while [ "x${tlist}" != "x" ] && [ "x$linux_list" != "x" ] ; do
+         current_tboot=`version_find_latest $tlist`
+         tboot_basename=`basename ${current_tboot}`
+         tboot_dirname=`dirname ${current_tboot}`
diff --git a/tboot.spec b/tboot.spec
index c67baef..8c0a5c4 100644
--- a/tboot.spec
+++ b/tboot.spec
@@ -1,7 +1,7 @@
 Summary:        Performs a verified launch using Intel TXT
 Name:           tboot
 Version:        1.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ URL:            http://sourceforge.net/projects/tboot/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         tboot-1.7.3-format-string.patch
 Patch1:         tboot-1.7.3-version-fix.patch
+Patch2:         tboot-1.7.3-grub-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  trousers-devel
@@ -29,6 +30,7 @@ and verified launch of an OS kernel/VMM.
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 /boot/tboot-syms
 
 %changelog
+* Tue Apr 02 2013 Gang Wei <gang.wei@intel.com> - 1:1.7.3-3
+- Fix for breaking grub2-mkconfig operation in 32bit case(#929384)
+
 * Wed Feb 20 2013 Gang Wei <gang.wei@intel.com> - 1:1.7.3-2
 - Fix version string in log