SHA256
1
0
forked from pool/tboot

Accepting request 232174 from home:msmeissn:branches:security

- tboot-cs381.patch: generate tboot entries correctly, from Intel.
  bnc#875581

OBS-URL: https://build.opensuse.org/request/show/232174
OBS-URL: https://build.opensuse.org/package/show/security/tboot?expand=0&rev=32
This commit is contained in:
Marcus Meissner 2014-04-30 09:32:20 +00:00 committed by Git OBS Bridge
parent 4c613aa4c4
commit 25b720120c
3 changed files with 48 additions and 0 deletions

40
tboot-cs381.patch Normal file
View File

@ -0,0 +1,40 @@
# HG changeset patch
# User Gang Wei <gang.wei@intel.com>
# 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 <gang.wei@intel.com>
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

View File

@ -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

View File

@ -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"