[meta-security][PATCH 1/2] tpm2.0-tools: update to latest

[meta-security][PATCH 1/2] tpm2.0-tools: update to latest

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

minor changes to reflect configure/makefile updates

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb b/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
index b7026aa..6f1141c 100644
--- a/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
+++ b/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
@@ -4,9 +4,10 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=91b7c548d73ea16537799e8060cea819"
 SECTION = "tpm"
 
-DEPENDS = "tpm2.0-tss openssl curl"
+DEPENDS = "pkgconfig tpm2.0-tss openssl curl autoconf-archive"
 
-SRCREV = "c924cc8ca752e5af6a829f893c6be4b185d56e99"
+# Mar 17, 2017
+SRCREV = "0b744d1b13ce57b4be547ae773d7db1cbccf9a04"
 
 SRC_URI = "git://github.com/01org/tpm2.0-tools.git;protocol=git;branch=master;name=tpm2.0-tools;destsuffix=tpm2.0-tools"
 
@@ -14,10 +15,6 @@ S = "${WORKDIR}/tpm2.0-tools"
 
 PV = "git${SRCPV}"
 
-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig
+
 
-do_configure () {
-	cd ${S}
-	./bootstrap  --force
-	./configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
-}
-- 
2.7.4

[meta-security][PATCH 2/2] tpm2.0-tss: update to latest

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

LICENSE file changes do to removal of TCG

minor changes do to configure and makefile updates

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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 ca82562..df67e12 100644
--- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
+++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
@@ -1,14 +1,15 @@
 SUMMARY = "Software stack for TPM2."
 DESCRIPTION = "tpm2.0-tss like woah."
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=17067aa50a585593d421b16cffd805a9"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
 SECTION = "tpm"
 
+DEPENDS = "autoconf-archive pkgconfig"
+
 SRCREV = "8e25d0cbb287d30c93b2b77e99bc761dc67e31a9"
 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://fix_musl_select_include.patch "
+    file://ax_pthread.m4"
 
 inherit autotools pkgconfig systemd
 
@@ -20,7 +21,7 @@ do_configure_prepend () {
 	# execute the bootstrap script
 	currentdir=$(pwd)
 	cd ${S}
-	./bootstrap --force
+	ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" ./bootstrap
 	cd $currentdir
 }
 
@@ -59,16 +60,22 @@ PACKAGES = " \
     resourcemgr \
 "
 
-FILES_libtss2 = "${libdir}/libsapi.so.0.0.0"
+FILES_libtss2 = " \
+	${libdir}/libsapi.so.0.0.0 \
+	${libdir}/libmarshal.so.0.0.0 \
+"
 FILES_libtss2-dev = " \
     ${includedir}/sapi \
     ${includedir}/tcti/common.h \
     ${libdir}/libsapi.so* \
+    ${libdir}/libmarshal.so* \
     ${libdir}/pkgconfig/sapi.pc \
 "
 FILES_libtss2-staticdev = " \
     ${libdir}/libsapi.a \
     ${libdir}/libsapi.la \
+    ${libdir}/libmarshal.a \
+    ${libdir}/libmarshal.la \
 "
 FILES_libtctidevice = "${libdir}/libtcti-device.so.0.0.0"
 FILES_libtctidevice-dev = " \
-- 
2.7.4