diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-04-01 14:57:17 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-04-01 15:10:41 -0700 |
commit | c1f4596e3650959c3239bfc9f392bb9d42520017 (patch) | |
tree | ee661d0a230fb2b50f235de21795d08d6646c594 | |
parent | d22c127b9495f8c9e5396f41543f5b07a3feba4b (diff) | |
download | meta-security-c1f4596e3650959c3239bfc9f392bb9d42520017.tar.gz |
tpm2.0-tss: fix musl build issue
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 | 5 |
2 files changed, 31 insertions, 1 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 new file mode 100644 index 0000000..b1e0aaa --- /dev/null +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch | |||
@@ -0,0 +1,27 @@ | |||
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 1e57342..6f9ce67 100644 --- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | |||
@@ -7,9 +7,12 @@ SECTION = "tpm" | |||
7 | DEPENDS = "autoconf-archive pkgconfig" | 7 | DEPENDS = "autoconf-archive pkgconfig" |
8 | 8 | ||
9 | SRCREV = "d1bd1fe175d233c7c5adbe1b9f3d256c41721001" | 9 | SRCREV = "d1bd1fe175d233c7c5adbe1b9f3d256c41721001" |
10 | |||
10 | SRC_URI = " \ | 11 | SRC_URI = " \ |
11 | 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 \ |
12 | file://ax_pthread.m4" | 13 | file://ax_pthread.m4 \ |
14 | file://musl_header_fix.patch \ | ||
15 | " | ||
13 | 16 | ||
14 | inherit autotools pkgconfig systemd | 17 | inherit autotools pkgconfig systemd |
15 | 18 | ||