3 files changed, 1 insertions, 83 deletions

diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0001-encrypt_secret.py-switch-to-python3.patch b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0001-encrypt_secret.py-switch-to-python3.patch
deleted file mode 100644
index 2ef8036..0000000
--- a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0001-encrypt_secret.py-switch-to-python3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 480648bd9a516fc84b02d0b83ebccf40547e5dd0 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Fri, 13 Mar 2020 20:17:46 +0800
-Subject: [PATCH] encrypt_secret.py: switch to python3
-
-Upstream-Status: Submitted [https://github.com/jiazhang0/cryptfs-tpm2/pull/7]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- scripts/encrypt_secret.py.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/scripts/encrypt_secret.py.in b/scripts/encrypt_secret.py.in
-index 1ddb76d..ffd3213 100755
---- a/scripts/encrypt_secret.py.in
-+++ b/scripts/encrypt_secret.py.in
-@@ -1,11 +1,10 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #coding: UTF-8
- 
- '''
- The simple encryption/decryption for secret info
- '''
- 
--from __future__ import print_function
- import logging
- import argparse
- import struct
--- 
-2.7.4
-
diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0001-lib-Makefile-set-correct-soname-for-libcryptfs-tpm2.patch b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0001-lib-Makefile-set-correct-soname-for-libcryptfs-tpm2.patch
deleted file mode 100644
index af6a6ab..0000000
--- a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0001-lib-Makefile-set-correct-soname-for-libcryptfs-tpm2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04b865d3af710e4116f0ff980918a984345a7ee3 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Fri, 17 Jul 2020 13:12:35 +0800
-Subject: [PATCH] lib/Makefile: set correct soname for libcryptfs-tpm2
-
-The current soname of libcryptfs-tpm2 is libcryptfs-tpm2.so:
-$ readelf -d libcryptfs-tpm2.so.0.7.0 | grep SONAME
-0x000000000000000e (SONAME)    Library soname: [libcryptfs-tpm2.so]
-
-The libcryptfs-tpm2.so is a symbolic link of libcryptfs-tmp2.so.0.7.0
-and it is not installed by default because it is packaged to dev
-package. Then we will encounter an error when run command cryptfs-tpm2:
-$ cryptfs-tpm2
-cryptfs-tpm2: error while loading shared libraries: libcryptfs-tpm2.so: cannot open shared object file: No such file or directory
-$ ldd cryptfs-tpm2 | grep libcryptfs-tpm2
-    libcryptfs-tpm2.so => not found
-
-Set the soname to libcryptfs-tpm2.so.$(MAJOR_VERSION) to fix the issue.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- src/lib/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/Makefile b/src/lib/Makefile
-index 75144e7..5a61572 100644
---- a/src/lib/Makefile
-+++ b/src/lib/Makefile
-@@ -40,11 +40,11 @@ install: all
-        $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
-        $(INSTALL) -m 755 $(LIB_NAME).a $(DESTDIR)$(LIBDIR)
-        $(INSTALL) -m 755 $(LIB_NAME).so $(DESTDIR)$(LIBDIR)/$(LIB_NAME).so.$(VERSION)
--       $(foreach x, $(LIB_NAME).so, ln -sfn $(x).$(VERSION) $(DESTDIR)$(LIBDIR)/$(patsubst %,%.$(MAJOR_VERSION).$(MINOR_VERSION),$(x)); \
--               ln -sfn $(x).$(MAJOR_VERSION).$(MINOR_VERSION) $(DESTDIR)$(LIBDIR)/$(patsubst %,%.$(MAJOR_VERSION),$(x));)
-+       $(foreach x, $(LIB_NAME), ln -sfn $(x).so.$(VERSION) $(DESTDIR)$(LIBDIR)/$(patsubst %,%.so.$(MAJOR_VERSION),$(x)); \
-+               ln -sfn $(x).so.$(VERSION) $(DESTDIR)$(LIBDIR)/$(patsubst %,%.so,$(x));)
- 
- $(LIB_NAME).so: $(OBJS_$(LIB_NAME))
--       $(CCLD) $^ -o $@ $(CFLAGS) -shared -Wl,-soname,$(patsubst %.$(VERSION),%,$@)
-+       $(CCLD) $^ -o $@ $(CFLAGS) -shared -Wl,-soname,$(patsubst %,%.$(MAJOR_VERSION),$@)
- 
- $(LIB_NAME).a: $(filter-out init.o,$(OBJS_$(LIB_NAME)))
-        $(AR) rcs $@ $^
--- 
-2.17.1
-
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 f80880f..6bc9f54 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,14 +22,12 @@ PV = "0.7.0+git${SRCPV}"
 SRC_URI = "\
     git://github.com/jiazhang0/cryptfs-tpm2.git \
     file://0001-luks-setup.sh-Add-support-for-qemu-with-the-swtpm.patch \
-    file://0001-encrypt_secret.py-switch-to-python3.patch \
     file://0002-luks-setup.sh-Updated-TPM-Tools.patch \
-    file://0001-lib-Makefile-set-correct-soname-for-libcryptfs-tpm2.patch \
     file://0001-Remove-build-time-from-show_banner.patch \
     file://0001-env.mk-fix-LDFLAGS-expansion.patch \
     file://0001-encrypt_secret.py-fix-for-python3.patch \
 "
-SRCREV = "87c35c63090a33d4de437f518b8da9f2d1f1d828"
+SRCREV = "62e7f4777495df4aeb0e02d3c761eea6f236f588"
 
 S = "${WORKDIR}/git"