diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-01-27 21:07:51 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-02-18 11:43:20 -0800 |
commit | 543f86aded7bbea1f32849029822e497126161d3 (patch) | |
tree | 911cd43d51eec5e89fd11401d524f799c6a92115 | |
parent | 7fd5f25475e02f39f2f81421dee9264ae56cbee8 (diff) | |
download | meta-security-543f86aded7bbea1f32849029822e497126161d3.tar.gz |
tpm2.0-tss: fix musl build error
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch | 31 | ||||
-rw-r--r-- | recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch b/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch new file mode 100644 index 0000000..ecaca6e --- /dev/null +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | This fixes musl build issue do to missing FD_* defines. | ||
2 | Add sys/select.h | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
7 | |||
8 | Index: TPM2.0-TSS/tcti/tcti_socket.cpp | ||
9 | =================================================================== | ||
10 | --- TPM2.0-TSS.orig/tcti/tcti_socket.cpp | ||
11 | +++ TPM2.0-TSS/tcti/tcti_socket.cpp | ||
12 | @@ -28,6 +28,7 @@ | ||
13 | #include <stdio.h> | ||
14 | #include <stdlib.h> // Needed for _wtoi | ||
15 | |||
16 | +#include "sys/select.h" | ||
17 | #include <sapi/tpm20.h> | ||
18 | #include <tcti/tcti_socket.h> | ||
19 | #include "sysapi_util.h" | ||
20 | Index: TPM2.0-TSS/resourcemgr/resourcemgr.c | ||
21 | =================================================================== | ||
22 | --- TPM2.0-TSS.orig/resourcemgr/resourcemgr.c | ||
23 | +++ TPM2.0-TSS/resourcemgr/resourcemgr.c | ||
24 | @@ -28,6 +28,7 @@ | ||
25 | #include <stdio.h> | ||
26 | #include <stdlib.h> // Needed for _wtoi | ||
27 | |||
28 | +#include "sys/select.h" | ||
29 | #include <sapi/tpm20.h> | ||
30 | #include <tcti/tcti_device.h> | ||
31 | #include <tcti/tcti_socket.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 c4b5c8c..a03559c 100644 --- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | |||
@@ -7,7 +7,8 @@ SECTION = "tpm" | |||
7 | SRCREV = "8e25d0cbb287d30c93b2b77e99bc761dc67e31a9" | 7 | SRCREV = "8e25d0cbb287d30c93b2b77e99bc761dc67e31a9" |
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ | 9 | git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ |
10 | file://ax_pthread.m4" | 10 | file://ax_pthread.m4 \ |
11 | file://fix_musl_select_include.patch " | ||
11 | 12 | ||
12 | inherit autotools pkgconfig | 13 | inherit autotools pkgconfig |
13 | 14 | ||