summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>2019-09-04 10:22:57 +0300
committerDmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>2019-09-04 12:01:45 +0300
commitfe4f5b1122378f302bb01ff14951d5401208f49a (patch)
treeb8f9bf58ac6ddca29d89cc838547b28f9fa4d6a4
parent127542429bfaf669d33f5d681ce72f8e9cec6598 (diff)
downloadmeta-secure-core-fe4f5b1122378f302bb01ff14951d5401208f49a.tar.gz
meta-tpm2: tpm2-tss: update to version 2.2.3
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc2
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch6
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb (renamed from meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb)5
3 files changed, 8 insertions, 5 deletions
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
16 16
17EXTRA_OECONF += " \ 17EXTRA_OECONF += " \
18 --with-udevrulesdir=${sysconfdir}/udev/rules.d \ 18 --with-udevrulesdir=${sysconfdir}/udev/rules.d \
19 --with-crypto=gcrypt \
20 --disable-doxygen-doc \
19" 21"
20 22
21PACKAGES = " \ 23PACKAGES = " \
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
19index d78d23f..7815c4b 100644 19index d78d23f..7815c4b 100644
20--- a/Makefile.am 20--- a/Makefile.am
21+++ b/Makefile.am 21+++ b/Makefile.am
22@@ -42,7 +42,13 @@ noinst_PROGRAMS = 22@@ -19,7 +19,13 @@ noinst_PROGRAMS =
23 23
24 ### Add ax_* rules ### 24 ### Add ax_* rules ###
25 # ax_code_coverage 25 # ax_code_coverage
@@ -37,8 +37,8 @@ diff --git a/configure.ac b/configure.ac
37index c8aa314..40883a8 100644 37index c8aa314..40883a8 100644
38--- a/configure.ac 38--- a/configure.ac
39+++ b/configure.ac 39+++ b/configure.ac
40@@ -206,6 +206,9 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, [Doxyfile], [doc/doxygen]) 40@@ -312,6 +312,9 @@ AS_IF([test "x$enable_doxygen_doc" != xn
41 AM_CONDITIONAL(DOXYMAN, [test $DX_FLAG_man -eq 1]) 41 [ERROR_IF_NO_PROG([doxygen])])
42 42
43 AX_CODE_COVERAGE 43 AX_CODE_COVERAGE
44+m4_ifdef([_AX_CODE_COVERAGE_RULES], 44+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.2.3.bb
index 9cc0247..9edc305 100644
--- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb
+++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb
@@ -1,10 +1,11 @@
1include ${BPN}.inc 1include ${BPN}.inc
2 2
3LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
3SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ 4SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
4 file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \ 5 file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \
5" 6"
6 7
7SRC_URI[md5sum] = "048ea77be36f881b7b6ecefbc1cf7dbd" 8SRC_URI[md5sum] = "593873bb023a0f8bcb93d12bc6640918"
8SRC_URI[sha256sum] = "7dfd05f7d2c4d5339d1c9ecbdba25f4ea6df70e96b09928e15e0560cce02d525" 9SRC_URI[sha256sum] = "1369aee648b33128b9ee8e3ad87f5fc6dc37c2077b9f134223ea04f4809a99c3"
9 10
10S = "${WORKDIR}/${BPN}-${PV}" 11S = "${WORKDIR}/${BPN}-${PV}"