starlingx/integ
Code Issues Proposed changes

upgrade tpm2-tools to CentOS 7.5 version

Browse Source 
Story: 2003389
Task: 24508
Depends-On: https://review.openstack.org/#/c/595525/

Change-Id: I4424414bcde7ac57faa692c72c76b089154839a7
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-08-24 00:28:54 +08:00 committed by Lin Shuicheng
parent a4684bffbc
commit 9d4ed58794
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/tpm2-tools/PKG-INFO
View File

@ -1,6 +1,6 @@
Metadata-Version: 1.1 Metadata-Version: 1.1
Name: tpm2-tools Name: tpm2-tools
Version: 1.1.0 Version: 3.0.1
Summary: A TPM2.0 testing tool build upon TPM2.0-TSS Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
Home-page: Home-page:
Author: Author:

26
security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,7 +1,7 @@
From cf30b93accbda4284677507a88ca3727a97fb83c Mon Sep 17 00:00:00 2001 From 63375de22771a9384eb9c4a90abc8ee2143a7721 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:30:57 -0400 Date: Mon, 2 Oct 2017 17:30:57 -0400
Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts: Conflicts:
SPECS/tpm2-tools.spec SPECS/tpm2-tools.spec
@ -10,26 +10,26 @@ Conflicts:
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec
index c858d6f..464c814 100644 index 935580d..12aa6a0 100644
--- a/SPECS/tpm2-tools.spec --- a/SPECS/tpm2-tools.spec
+++ b/SPECS/tpm2-tools.spec +++ b/SPECS/tpm2-tools.spec
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
Name: tpm2-tools Name: tpm2-tools
Version: 1.1.0 Version: 3.0.1
-Release: 7%{?dist} -Release: 1%{?dist}
+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: A TPM2.0 testing tool build upon TPM2.0-TSS Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
%global pkg_prefix tpm2.0-tools License: BSD
@@ -44,7 +44,7 @@ BuildRequires: pkgconfig(tcti-socket) @@ -33,7 +33,7 @@ BuildRequires: pkgconfig(tcti-tabrmd)
ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64
# tpm2-tools is heavily depending on TPM2.0-TSS project, matched tss is required # tpm2-tools is heavily depending on TPM2.0-TSS project, matched tss is required
-Requires: tpm2-tss%{?_isa} >= 1.0-2%{?dist} -Requires: tpm2-tss%{?_isa} >= 1.3.0-1%{?dist}
+Requires: tpm2-tss%{?_isa} = 1.0-2.el7 +Requires: tpm2-tss%{?_isa} = 1.3.0-2%{?dist}
%description # tpm2-tools project changed the install path for binaries and man page section
tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. Obsoletes: tpm2-tools <= 2.1.0-2
-- --
1.9.1 2.7.4

2
security/tpm2-tools/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/tpm2-tools-1.1.0-7.el7.src.rpm mirror:Source/tpm2-tools-3.0.1-1.el7.src.rpm