cryptfs-tpm2: Update to the latest

- Follow up the regular way to include header file.
- Use CCLD to build executable and library.

Signed-off-by: Jia Zhang <zhang.jia@linux.alibaba.com>

1 files changed, 4 insertions, 3 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 c9d2a1f..4c7b0fd 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
@@ -22,7 +22,7 @@ PV = "0.7.0+git${SRCPV}"
 SRC_URI = "\
     git://github.com/jiazhang0/cryptfs-tpm2.git \
 "
-SRCREV = "cb83b1d02e163d2e343e9e0bc3565c1d2c601b84"
+SRCREV = "87c35c63090a33d4de437f518b8da9f2d1f1d828"
 
 S = "${WORKDIR}/git"
 
@@ -30,10 +30,11 @@ EXTRA_OEMAKE = "\
     sbindir="${sbindir}" \
     libdir="${libdir}" \
     includedir="${includedir}" \
-    tpm2_tss_includedir="${STAGING_INCDIR}/tss2" \
+    tpm2_tss_includedir="${STAGING_INCDIR}" \
     tpm2_tss_libdir="${STAGING_LIBDIR}" \
-    tpm2_tabrmd_includedir="${STAGING_INCDIR}/tss2" \
+    tpm2_tabrmd_includedir="${STAGING_INCDIR}" \
     CC="${CC}" \
+    CCLD="${CCLD}" \
     PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \
     EXTRA_CFLAGS="${CFLAGS}" \
     EXTRA_LDFLAGS="${LDFLAGS}" \