diff --git a/tboot-cs381.patch b/tboot-cs381.patch new file mode 100644 index 0000000..892fe84 --- /dev/null +++ b/tboot-cs381.patch @@ -0,0 +1,40 @@ +# HG changeset patch +# User Gang Wei +# Date 1398749209 -28800 +# Tue Apr 29 13:26:49 2014 +0800 +# Node ID 0883c5da94978917c81e654cabbf734e82a33b23 +# Parent acfeeead17db852d23631a3dd0ec8a29836fce2d +Fix grub cfg file generation scripts for SLES12 + +Signed-off-by: Gang Wei + +diff -r acfeeead17db -r 0883c5da9497 tboot/20_linux_tboot +--- a/tboot/20_linux_tboot Tue Apr 22 14:00:56 2014 +0800 ++++ b/tboot/20_linux_tboot Tue Apr 29 13:26:49 2014 +0800 +@@ -44,11 +44,6 @@ + case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` +- # We can't cope with devices loop-mounted from files here. +- case ${GRUB_DEVICE} in +- /dev/*) ;; +- *) exit 0 ;; +- esac + ;; + esac + +diff -r acfeeead17db -r 0883c5da9497 tboot/20_linux_xen_tboot +--- a/tboot/20_linux_xen_tboot Tue Apr 22 14:00:56 2014 +0800 ++++ b/tboot/20_linux_xen_tboot Tue Apr 29 13:26:49 2014 +0800 +@@ -44,11 +44,6 @@ + case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` +- # We can't cope with devices loop-mounted from files here. +- case ${GRUB_DEVICE} in +- /dev/*) ;; +- *) exit 0 ;; +- esac + ;; + esac + diff --git a/tboot.changes b/tboot.changes index 35d163c..53d5265 100644 --- a/tboot.changes +++ b/tboot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 30 08:42:27 UTC 2014 - meissner@suse.com + +- tboot-cs381.patch: generate tboot entries correctly, from Intel. + bnc#875581 + ------------------------------------------------------------------- Wed Feb 19 16:05:10 UTC 2014 - meissner@suse.com diff --git a/tboot.spec b/tboot.spec index 4f8fac2..ae291f6 100644 --- a/tboot.spec +++ b/tboot.spec @@ -27,6 +27,7 @@ Url: http://sourceforge.net/projects/tboot/ Source0: http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver}.tar.gz Patch0: tboot-fix.patch Patch1: tboot-grub2-suse.patch +Patch2: tboot-cs381.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel BuildRequires: trousers-devel @@ -42,6 +43,7 @@ and verified launch of an OS kernel/VMM. %setup -q -n %name-%ver %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS"