From 901478bfdc6315a1f207114b3a259b069defe0a3 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 2 Apr 2021 16:08:40 +0000 Subject: swtpm: fix check for tscd deamon on host Signed-off-by: Armin Kuster --- .../recipes-tpm/swtpm/files/oe_configure.patch | 26 ++++++++++++++++++++++ meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta-tpm/recipes-tpm/swtpm/files/oe_configure.patch diff --git a/meta-tpm/recipes-tpm/swtpm/files/oe_configure.patch b/meta-tpm/recipes-tpm/swtpm/files/oe_configure.patch new file mode 100644 index 0000000..fc5943e --- /dev/null +++ b/meta-tpm/recipes-tpm/swtpm/files/oe_configure.patch @@ -0,0 +1,26 @@ +Don't check for tscd deamon on host. + +Upstream-Status: OE Specific + +Signed-off-by: Armin Kuster + +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -179,14 +179,7 @@ AC_SUBST([LIBTPMS_LIBS]) + AC_CHECK_LIB(c, clock_gettime, LIBRT_LIBS="", LIBRT_LIBS="-lrt") + AC_SUBST([LIBRT_LIBS]) + +-AC_PATH_PROG([TCSD], tcsd) +-if test "x$TCSD" = "x"; then +- have_tcsd=no +- AC_MSG_WARN([tcsd could not be found; typically need it for tss user account and tests]) +-else +- have_tcsd=yes +-fi +-AM_CONDITIONAL([HAVE_TCSD], test "$have_tcsd" != "no") ++have_tcsd=no + + dnl We either need netstat (more common across systems) or 'ss' for test cases + AC_PATH_PROG([NETSTAT], [netstat]) diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb index ab77196..caf99e8 100644 --- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb +++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb @@ -12,6 +12,7 @@ DEPENDS_append = " tpm-tools-native expect-native socat-native python3-pip-nativ SRCREV = "e59c0c1a7b4c8d652dbb280fd6126895a7057464" SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.5 \ file://ioctl_h.patch \ + file://oe_configure.patch \ " PE = "1" -- cgit v1.2.3-54-g00ecf