From fe4f5b1122378f302bb01ff14951d5401208f49a Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
Date: Wed, 4 Sep 2019 10:22:57 +0300
Subject: meta-tpm2: tpm2-tss: update to version 2.2.3

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
---
 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc                   |  2 ++
 ...build-update-for-ax_code_coverage.m4-version-2019.01.patch |  6 +++---
 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb              | 10 ----------
 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb              | 11 +++++++++++
 4 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb
 create mode 100644 meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb

diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc
index e917b87..602cf6a 100644
--- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc
+++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc
@@ -16,6 +16,8 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF += " \
     --with-udevrulesdir=${sysconfdir}/udev/rules.d \
+    --with-crypto=gcrypt \
+    --disable-doxygen-doc \
 "
 
 PACKAGES = " \
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch
index 56f9d4b..c8b1ddb 100644
--- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch
+++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch
@@ -19,7 +19,7 @@ diff --git a/Makefile.am b/Makefile.am
 index d78d23f..7815c4b 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -42,7 +42,13 @@ noinst_PROGRAMS =
+@@ -19,7 +19,13 @@ noinst_PROGRAMS =
  
  ### Add ax_* rules ###
  # ax_code_coverage
@@ -37,8 +37,8 @@ diff --git a/configure.ac b/configure.ac
 index c8aa314..40883a8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -206,6 +206,9 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, [Doxyfile], [doc/doxygen])
- AM_CONDITIONAL(DOXYMAN, [test $DX_FLAG_man -eq 1])
+@@ -312,6 +312,9 @@ AS_IF([test "x$enable_doxygen_doc" != xn
+       [ERROR_IF_NO_PROG([doxygen])])
  
  AX_CODE_COVERAGE
 +m4_ifdef([_AX_CODE_COVERAGE_RULES],
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb
deleted file mode 100644
index 9cc0247..0000000
--- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-include ${BPN}.inc
-
-SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
-           file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \
-"
-
-SRC_URI[md5sum] = "048ea77be36f881b7b6ecefbc1cf7dbd"
-SRC_URI[sha256sum] = "7dfd05f7d2c4d5339d1c9ecbdba25f4ea6df70e96b09928e15e0560cce02d525"
-
-S = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb
new file mode 100644
index 0000000..9edc305
--- /dev/null
+++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb
@@ -0,0 +1,11 @@
+include ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
+SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
+           file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \
+"
+
+SRC_URI[md5sum] = "593873bb023a0f8bcb93d12bc6640918"
+SRC_URI[sha256sum] = "1369aee648b33128b9ee8e3ad87f5fc6dc37c2077b9f134223ea04f4809a99c3"
+
+S = "${WORKDIR}/${BPN}-${PV}"
-- 
cgit v1.2.3-54-g00ecf