[tboot] Fix the version number output in booting log from 1.7.2 to 1.7.3.
gwei3
gwei3 at fedoraproject.org
Wed Feb 20 09:15:22 UTC 2013
commit 4e7c5da1286e55d28c6b9bee82e25005d49ae8b1
Author: Gang Wei <gang.wei at intel.com>
Date: Wed Feb 20 04:13:11 2013 -0500
Fix the version number output in booting log from 1.7.2 to 1.7.3.
tboot-1.7.3-version-fix.patch | 12 ++++++++++++
tboot.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/tboot-1.7.3-version-fix.patch b/tboot-1.7.3-version-fix.patch
new file mode 100644
index 0000000..ac8cf90
--- /dev/null
+++ b/tboot-1.7.3-version-fix.patch
@@ -0,0 +1,12 @@
+diff -r 5192fef95f6f tboot/Config.mk
+--- a/tboot/Config.mk Fri Dec 28 14:30:13 2012 +0800
++++ b/tboot/Config.mk Wed Feb 20 03:32:49 2013 -0500
+@@ -32,7 +32,7 @@
+ CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
+
+ # changeset variable for banner
+-CFLAGS += -DTBOOT_CHANGESET=\""$(shell ((hg parents --template "{isodate|isodate} {rev}:{node|short}" >/dev/null && hg parents --template "{isodate|isodate} {rev}:{node|short}") || echo "2012-09-29 15:30 +0800 1.7.2") 2>/dev/null)"\"
++CFLAGS += -DTBOOT_CHANGESET=\""$(shell ((hg parents --template "{isodate|isodate} {rev}:{node|short}" >/dev/null && hg parents --template "{isodate|isodate} {rev}:{node|short}") || echo "2012-12-28 14:30 +0800 1.7.3") 2>/dev/null)"\"
+
+
+ AFLAGS += -D__ASSEMBLY__
diff --git a/tboot.spec b/tboot.spec
index 0f0eda3..c67baef 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: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Group: System Environment/Base
@@ -9,6 +9,7 @@ License: BSD
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trousers-devel
@@ -27,6 +28,7 @@ and verified launch of an OS kernel/VMM.
%ifarch %{ix86}
%patch0 -p1
%endif
+%patch1 -p1
%build
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
@@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
/boot/tboot-syms
%changelog
+* Wed Feb 20 2013 Gang Wei <gang.wei at intel.com> - 1:1.7.3-2
+- Fix version string in log
+
* Wed Jan 30 2013 David Cantrell <dcantrell at redhat.com> - 1:1.7.3-1
- Upgrade to latest upstream version (#902653)
More information about the scm-commits
mailing list