starlingx/integ
Code Issues Proposed changes

Merge "CentOS 8: Upgrade tpm2-tools to version 3.1.1" into f/centos8

Browse Source
This commit is contained in:
Zuul 2019-12-18 15:35:57 +00:00 committed by Gerrit Code Review
commit 356dc9c9a6
5 changed files with 14 additions and 13 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: 3.0.1 Version: 3.1.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:

2
security/tpm2-tools/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
#COPY_LIST="tpm2-tools/*" #COPY_LIST="tpm2-tools/*"
TIS_PATCH_VER=0 TIS_PATCH_VER=1

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

@ -1,9 +1,9 @@
From 63375de22771a9384eb9c4a90abc8ee2143a7721 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] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [PATCH] 0001-Update-package-versioning-for-TIS-format.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
SPECS/tpm2-tools.spec | 2 +- SPECS/tpm2-tools.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -14,12 +14,12 @@ index 935580d..12aa6a0 100644
+++ 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: 3.0.4 Version: 3.1.1
-Release: 2%{?dist} -Release: 4%{?dist}
+Release: 2.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 4.el8%{?_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
License: BSD License: BSD
-- --
2.7.4 1.8.3.1

9
security/tpm2-tools/centos/meta_patches/disable-socket-mode-TCTI.patch
View File

@ -1,8 +1,9 @@
From e54d19f53dcd78d0aaceb30d1fb89eebefc1c066 Mon Sep 17 00:00:00 2001 From e54d19f53dcd78d0aaceb30d1fb89eebefc1c066 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:56 -0400 Date: Mon, 2 Oct 2017 17:30:56 -0400
Subject: [PATCH 1/2] WRS: disable-socket-mode-TCTI.patch Subject: [PATCH 1/2] disable-socket-mode-TCTI.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
SPECS/tpm2-tools.spec | 2 +- SPECS/tpm2-tools.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -11,8 +12,8 @@ diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec
index 308ecfa..935580d 100644 index 308ecfa..935580d 100644
--- a/SPECS/tpm2-tools.spec --- a/SPECS/tpm2-tools.spec
+++ b/SPECS/tpm2-tools.spec +++ b/SPECS/tpm2-tools.spec
@@ -43,7 +43,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. @@ -35,7 +35,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
./bootstrap %autosetup -p1 -n %{name}-%{version}
%build %build
-%configure --prefix=/usr --disable-static --disable-silent-rules -%configure --prefix=/usr --disable-static --disable-silent-rules
@ -21,5 +22,5 @@ index 308ecfa..935580d 100644
%install %install
-- --
2.7.4 1.8.3.1

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

@ -1 +1 @@
mirror:Source/tpm2-tools-3.0.4-2.el7.src.rpm mirror:Source/tpm2-tools-3.1.1-4.el8.src.rpm