Fix the version number output in booting log from 1.7.2 to 1.7.3.

This commit is contained in:
Gang Wei 2013-02-20 04:13:11 -05:00
parent e21667dab8
commit 4e7c5da128
2 changed files with 18 additions and 1 deletions

View File

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

View File

@ -1,7 +1,7 @@
Summary: Performs a verified launch using Intel TXT Summary: Performs a verified launch using Intel TXT
Name: tboot Name: tboot
Version: 1.7.3 Version: 1.7.3
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Group: System Environment/Base Group: System Environment/Base
@ -9,6 +9,7 @@ License: BSD
URL: http://sourceforge.net/projects/tboot/ URL: http://sourceforge.net/projects/tboot/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: tboot-1.7.3-format-string.patch 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trousers-devel BuildRequires: trousers-devel
@ -27,6 +28,7 @@ and verified launch of an OS kernel/VMM.
%ifarch %{ix86} %ifarch %{ix86}
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 -p1
%build %build
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
/boot/tboot-syms /boot/tboot-syms
%changelog %changelog
* Wed Feb 20 2013 Gang Wei <gang.wei@intel.com> - 1:1.7.3-2
- Fix version string in log
* Wed Jan 30 2013 David Cantrell <dcantrell@redhat.com> - 1:1.7.3-1 * Wed Jan 30 2013 David Cantrell <dcantrell@redhat.com> - 1:1.7.3-1
- Upgrade to latest upstream version (#902653) - Upgrade to latest upstream version (#902653)