remove merged patch now in tip
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
.../tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch | 27 ----------------------
recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 3 +--
2 files changed, 1 insertion(+), 29 deletions(-)
delete mode 100644 recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch
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 @@
-Add missing header to avoid:
-
-../TPM2.0-TSS/tcti/tcti_socket.c: In function 'SocketReceiveTpmResponse':
-| ../TPM2.0-TSS/tcti/tcti_socket.c:286:5: error: unknown type name 'fd_set'
-| fd_set readFds;
-| ^~~~~~
-| ../TPM2.0-TSS/tcti/tcti_socket.c:287:20: error: storage size of 'tv' isn't
known
-| struct timeval tv, *tvPtr;
-| ^~
-
-Upstream-Status: Submitted
-tcti_socket: fix musl build issue do to missing header #393
-
-Signed-off-by: Armin Kuster <akus...@mvista.com>
-
-Index: TPM2.0-TSS/tcti/tcti_socket.c
-===================================================================
---- TPM2.0-TSS.orig/tcti/tcti_socket.c
-+++ TPM2.0-TSS/tcti/tcti_socket.c
-@@ -27,6 +27,7 @@
-
- #include <stdio.h>
- #include <stdlib.h> // Needed for _wtoi
-+#include <sys/time.h>
-
- #include "sapi/tpm20.h"
- #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"
DEPENDS = "autoconf-archive pkgconfig"
-SRCREV = "d1bd1fe175d233c7c5adbe1b9f3d256c41721001"
+SRCREV = "30794affab01598bbacfe1f167be7c068a0c0476"
SRC_URI = " \
git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS
\
file://ax_pthread.m4 \
- file://musl_header_fix.patch \
"
inherit autotools pkgconfig systemd
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
