From cc40f6c890adfb56a697c6294439fede797b5b87 Mon Sep 17 00:00:00 2001
From: Yunguo Wei <yunguo.wei@windriver.com>
Date: Tue, 11 Sep 2018 09:49:18 +0800
Subject: cryptfs-tpm2: uprev to 0.7

Now cryptfs-tpm2 supports both TSS 1.x and 2.x API.

Please specify "TSS2_VER=1" in EXTRA_OEMAKE to support 1.x API.

Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
---
 .../recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
index 084318f..c9d2a1f 100644
--- a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
+++ b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
@@ -17,12 +17,12 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=89c8ce1346a3dfe75379e84f3ba9d641"
 
 DEPENDS += "tpm2-tss tpm2-abrmd pkgconfig-native"
 
-PV = "0.6.3+git${SRCPV}"
+PV = "0.7.0+git${SRCPV}"
 
 SRC_URI = "\
     git://github.com/jiazhang0/cryptfs-tpm2.git \
 "
-SRCREV = "fb49abad57f7da72e94ed61b30fbf777400cf0a7"
+SRCREV = "cb83b1d02e163d2e343e9e0bc3565c1d2c601b84"
 
 S = "${WORKDIR}/git"
 
@@ -30,9 +30,9 @@ EXTRA_OEMAKE = "\
     sbindir="${sbindir}" \
     libdir="${libdir}" \
     includedir="${includedir}" \
-    tpm2_tss_includedir="${STAGING_INCDIR}/sapi" \
+    tpm2_tss_includedir="${STAGING_INCDIR}/tss2" \
     tpm2_tss_libdir="${STAGING_LIBDIR}" \
-    tpm2_tabrmd_includedir="${STAGING_INCDIR}" \
+    tpm2_tabrmd_includedir="${STAGING_INCDIR}/tss2" \
     CC="${CC}" \
     PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \
     EXTRA_CFLAGS="${CFLAGS}" \
@@ -70,8 +70,8 @@ FILES_${PN}-initramfs = "\
 # @tpm2-abrmd: optional
 RDEPENDS_${PN} += "\
     libtss2 \
-    libtctidevice \
-    libtctisocket \
+    libtss2-tcti-device \
+    libtss2-tcti-mssim \
     bash \
     coreutils \
     grep \
-- 
cgit v1.2.3-54-g00ecf