From ae2801da58fe8f7386882cba80c69c6acd6e8146 Mon Sep 17 00:00:00 2001
From: Chris Conlon <chris@wolfssl.com>
Date: Mon, 6 Dec 2021 12:46:03 -0800
Subject: [PATCH] update wolfTPM from 2.0.0 to 2.3.1

---
 .../files/0001-fix-have-wolfssl-m4-rule.patch     | 13 -------------
 .../{wolftpm_2.0.0.bb => wolftpm_2.3.1.bb}        | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-wolfssl/wolftpm/files/0001-fix-have-wolfssl-m4-rule.patch
 rename recipes-wolfssl/wolftpm/{wolftpm_2.0.0.bb => wolftpm_2.3.1.bb} (69%)

diff --git a/recipes-wolfssl/wolftpm/files/0001-fix-have-wolfssl-m4-rule.patch b/recipes-wolfssl/wolftpm/files/0001-fix-have-wolfssl-m4-rule.patch
deleted file mode 100644
index 28d83d2..0000000
--- a/recipes-wolfssl/wolftpm/files/0001-fix-have-wolfssl-m4-rule.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: wolfssh-1.3.0/m4/have_wolfssl.m4
-===================================================================
---- wolfssh-1.3.0.orig/m4/have_wolfssl.m4
-+++ wolfssh-1.3.0/m4/have_wolfssl.m4
-@@ -7,7 +7,7 @@
- AC_DEFUN([_TAO_SEARCH_LIBWOLFSSL],[
-   AC_REQUIRE([AC_LIB_PREFIX])
- 
--  LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+  LDFLAGS="$LDFLAGS"
-   LIBS="$LIBS -lwolfssl"
- 
-   AC_LIB_HAVE_LINKFLAGS(wolfssl,,
diff --git a/recipes-wolfssl/wolftpm/wolftpm_2.0.0.bb b/recipes-wolfssl/wolftpm/wolftpm_2.3.1.bb
similarity index 69%
rename from recipes-wolfssl/wolftpm/wolftpm_2.0.0.bb
rename to recipes-wolfssl/wolftpm/wolftpm_2.3.1.bb
index ea5463d..4b9f873 100644
--- a/recipes-wolfssl/wolftpm/wolftpm_2.0.0.bb
+++ b/recipes-wolfssl/wolftpm/wolftpm_2.3.1.bb
@@ -12,9 +12,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS += "wolfssl"
 
-SRC_URI[md5sum] = "f0d3b91139917b404e75a93d6a24d8fb"
-SRC_URI[sha256sum] = "e99914a4cbfef7f0e311f48d107685ac5e1574f41709f578aa3502604b290468"
-SRC_URI = "https://www.wolfssl.com/wolftpm-${PV}.zip \
-           file://0001-fix-have-wolfssl-m4-rule.patch"
+SRC_URI = "git://github.com/wolfssl/wolfTPM.git;tag=v${PV}"
 
-inherit autotools
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-wolfcrypt=${COMPONENTS_DIR}/${PACKAGE_ARCH}/wolfssl/usr"
+
+do_configure_prepend() {
+    (cd ${S}; ./autogen.sh; cd -)
+}