diff options
author | Armin Kuster <akuster808@gmail.com> | 2020-06-13 18:41:00 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-06-19 16:03:23 -0700 |
commit | 1fb84970818ed9370de08cdce84a825c56f868a9 (patch) | |
tree | 6ac4ab4380eb52ce1f56ec56d809a744565f66a4 | |
parent | a08e8456422e2e2232287aaabba05ec681e60f38 (diff) | |
download | meta-security-1fb84970818ed9370de08cdce84a825c56f868a9.tar.gz |
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.patch | 23 | ||||
-rw-r--r-- | meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb | 4 |
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 @@ | |||
1 | Fix defined to match tpm2-tools 4.1.1 | ||
2 | |||
3 | Upstream-Status: Submitted https://github.com/tpm2-software/tpm2-tcti-uefi/pull/81 | ||
4 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
5 | |||
6 | Index: git/example/tpm2-get-caps-fixed.c | ||
7 | =================================================================== | ||
8 | --- git.orig/example/tpm2-get-caps-fixed.c | ||
9 | +++ git/example/tpm2-get-caps-fixed.c | ||
10 | @@ -140,11 +140,11 @@ dump_tpm_properties_fixed (TPMS_TAGGED_P | ||
11 | Print (L"TPM2_PT_INPUT_BUFFER:\n" | ||
12 | " value: 0x%X\n", value); | ||
13 | break; | ||
14 | - case TPM2_PT_HR_TRANSIENT_MIN: | ||
15 | + case TPM2_PT_TPM2_HR_TRANSIENT_MIN: | ||
16 | Print (L"TPM2_PT_TPM2_HR_TRANSIENT_MIN:\n" | ||
17 | " value: 0x%X\n", value); | ||
18 | break; | ||
19 | - case TPM2_PT_HR_PERSISTENT_MIN: | ||
20 | + case TPM2_PT_TPM2_HR_PERSISTENT_MIN: | ||
21 | Print (L"TPM2_PT_TPM2_HR_PERSISTENT_MIN:\n" | ||
22 | " value: 0x%X\n", value); | ||
23 | 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- | |||
7 | SRC_URI = "git://github.com/tpm2-software/tpm2-tcti-uefi.git \ | 7 | SRC_URI = "git://github.com/tpm2-software/tpm2-tcti-uefi.git \ |
8 | file://configure_oe_fixup.patch \ | 8 | file://configure_oe_fixup.patch \ |
9 | file://0001-configure.ac-stop-inserting-host-directories-into-co.patch \ | 9 | file://0001-configure.ac-stop-inserting-host-directories-into-co.patch \ |
10 | file://tpm2-get-caps-fixed.patch \ | ||
11 | file://fix_header_file.patch \ | 10 | file://fix_header_file.patch \ |
12 | " | 11 | " |
12 | |||
13 | SRCREV = "0241b08f069f0fdb3612f5c1b938144dbe9be811" | 13 | SRCREV = "0241b08f069f0fdb3612f5c1b938144dbe9be811" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |