aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2020-06-13 18:41:00 +0000
committerArmin Kuster <akuster808@gmail.com>2020-06-19 16:03:23 -0700
commit1fb84970818ed9370de08cdce84a825c56f868a9 (patch)
tree6ac4ab4380eb52ce1f56ec56d809a744565f66a4
parenta08e8456422e2e2232287aaabba05ec681e60f38 (diff)
downloadmeta-security-1fb84970818ed9370de08cdce84a825c56f868a9.tar.gz
meta-security-1fb84970818ed9370de08cdce84a825c56f868a9.tar.bz2
meta-security-1fb84970818ed9370de08cdce84a825c56f868a9.zip
tpm2-tcti-uefi: drop patch no longer needed
drop tpm2-get-caps-fixed.patch, tss update negated the need for this change. Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/tpm2-get-caps-fixed.patch23
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb4
2 files changed, 2 insertions, 25 deletions
diff --git a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/tpm2-get-caps-fixed.patch b/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/tpm2-get-caps-fixed.patch
deleted file mode 100644
index bc70913..0000000
--- a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/tpm2-get-caps-fixed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix defined to match tpm2-tools 4.1.1
-
-Upstream-Status: Submitted https://github.com/tpm2-software/tpm2-tcti-uefi/pull/81
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
-Index: git/example/tpm2-get-caps-fixed.c
-===================================================================
---- git.orig/example/tpm2-get-caps-fixed.c
-+++ git/example/tpm2-get-caps-fixed.c
-@@ -140,11 +140,11 @@ dump_tpm_properties_fixed (TPMS_TAGGED_P
- Print (L"TPM2_PT_INPUT_BUFFER:\n"
- " value: 0x%X\n", value);
- break;
-- case TPM2_PT_HR_TRANSIENT_MIN:
-+ case TPM2_PT_TPM2_HR_TRANSIENT_MIN:
- Print (L"TPM2_PT_TPM2_HR_TRANSIENT_MIN:\n"
- " value: 0x%X\n", value);
- break;
-- case TPM2_PT_HR_PERSISTENT_MIN:
-+ case TPM2_PT_TPM2_HR_PERSISTENT_MIN:
- Print (L"TPM2_PT_TPM2_HR_PERSISTENT_MIN:\n"
- " value: 0x%X\n", value);
- break;
diff --git a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb b/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
index 67b36b7..a67e3c3 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
@@ -7,9 +7,9 @@ DEPENDS = "libtss2-dev libtss2-mu-dev gnu-efi-native gnu-efi pkgconfig autoconf-
SRC_URI = "git://github.com/tpm2-software/tpm2-tcti-uefi.git \
file://configure_oe_fixup.patch \
file://0001-configure.ac-stop-inserting-host-directories-into-co.patch \
- file://tpm2-get-caps-fixed.patch \
file://fix_header_file.patch \
- "
+"
+
SRCREV = "0241b08f069f0fdb3612f5c1b938144dbe9be811"
S = "${WORKDIR}/git"