diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-04-11 20:51:15 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-04-25 18:14:24 -0700 |
commit | 5f68ae6d2875df24773a22010f1e5483148f6b69 (patch) | |
tree | e7d91d92461c530d702649c904cdf40ae44902c2 | |
parent | 41936bb4cf2764b44972893c53d4b52c1faf061f (diff) | |
download | meta-security-5f68ae6d2875df24773a22010f1e5483148f6b69.tar.gz |
tpm2.0-tss: update to tip.
remove merged patch now in tip
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch | 27 | ||||
-rw-r--r-- | recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 3 |
2 files changed, 1 insertions, 29 deletions
diff --git a/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch b/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch deleted file mode 100644 index b1e0aaa..0000000 --- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Add missing header to avoid: | ||
2 | |||
3 | ../TPM2.0-TSS/tcti/tcti_socket.c: In function 'SocketReceiveTpmResponse': | ||
4 | | ../TPM2.0-TSS/tcti/tcti_socket.c:286:5: error: unknown type name 'fd_set' | ||
5 | | fd_set readFds; | ||
6 | | ^~~~~~ | ||
7 | | ../TPM2.0-TSS/tcti/tcti_socket.c:287:20: error: storage size of 'tv' isn't known | ||
8 | | struct timeval tv, *tvPtr; | ||
9 | | ^~ | ||
10 | |||
11 | Upstream-Status: Submitted | ||
12 | tcti_socket: fix musl build issue do to missing header #393 | ||
13 | |||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | Index: TPM2.0-TSS/tcti/tcti_socket.c | ||
17 | =================================================================== | ||
18 | --- TPM2.0-TSS.orig/tcti/tcti_socket.c | ||
19 | +++ TPM2.0-TSS/tcti/tcti_socket.c | ||
20 | @@ -27,6 +27,7 @@ | ||
21 | |||
22 | #include <stdio.h> | ||
23 | #include <stdlib.h> // Needed for _wtoi | ||
24 | +#include <sys/time.h> | ||
25 | |||
26 | #include "sapi/tpm20.h" | ||
27 | #include "sapi/marshal.h" | ||
diff --git a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb index 6f9ce67..14ec0ab 100644 --- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | |||
@@ -6,12 +6,11 @@ SECTION = "tpm" | |||
6 | 6 | ||
7 | DEPENDS = "autoconf-archive pkgconfig" | 7 | DEPENDS = "autoconf-archive pkgconfig" |
8 | 8 | ||
9 | SRCREV = "d1bd1fe175d233c7c5adbe1b9f3d256c41721001" | 9 | SRCREV = "30794affab01598bbacfe1f167be7c068a0c0476" |
10 | 10 | ||
11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
12 | git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ | 12 | git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ |
13 | file://ax_pthread.m4 \ | 13 | file://ax_pthread.m4 \ |
14 | file://musl_header_fix.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | inherit autotools pkgconfig systemd | 16 | inherit autotools pkgconfig systemd |