diff options
Diffstat (limited to 'meta-security/meta-tpm/recipes-tpm2/tpm2-tss')
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-configure.ac-fix-compatibility-with-autoconf-2.70.patch | 48 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb (renamed from meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.4.3.bb) | 6 |
2 files changed, 52 insertions, 2 deletions
diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-configure.ac-fix-compatibility-with-autoconf-2.70.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-configure.ac-fix-compatibility-with-autoconf-2.70.patch new file mode 100644 index 000000000..cae2e76e1 --- /dev/null +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-configure.ac-fix-compatibility-with-autoconf-2.70.patch @@ -0,0 +1,48 @@ +From 03cca78d24d716eec792f86f5b0bc69886fad981 Mon Sep 17 00:00:00 2001 +From: Patrick McCarty <patrick.mccarty@intel.com> +Date: Fri, 18 Dec 2020 01:54:05 +0000 +Subject: [PATCH] configure.ac: fix compatibility with autoconf 2.70 + +With autoconf 2.70, not quoting the second argument to one of the AS_IF +macro expansions leads to generation of invalid shell code affecting the +first nested ERROR_IF_NO_PROG expansion. + +The invalid shell code leads to an error resembling: + + ./configure: line 18826: syntax error near unexpected token `newline' + ./configure: line 18826: ` ''' + +Fix the issue by quoting the second argument to the affected AS_IF, +similar to the quoting found elsewhere in configure.ac. + +Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com> + +Upstream-Status: Backport +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: tpm2-tss-3.0.3/configure.ac +=================================================================== +--- tpm2-tss-3.0.3.orig/configure.ac ++++ tpm2-tss-3.0.3/configure.ac +@@ -279,7 +279,7 @@ AC_ARG_ENABLE([integration], + [build and execute integration tests])],, + [enable_integration=no]) + AS_IF([test "x$enable_integration" = "xyes"], +- AS_IF([test "$HOSTOS" = "Linux"], ++ [AS_IF([test "$HOSTOS" = "Linux"], + [ERROR_IF_NO_PROG([ss])], + [ERROR_IF_NO_PROG([sockstat])]) + ERROR_IF_NO_PROG([echo]) +@@ -328,7 +328,7 @@ AS_IF([test "x$enable_integration" = "xy + [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])]) + AC_SUBST([INTEGRATION_TCTI], [$integration_tcti]) + AC_SUBST([INTEGRATION_ARGS], [$integration_args]) +- AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])) ++ AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])]) + AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"]) + # + # sanitizer compiler flags diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.4.3.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb index 78be51359..b2486e5be 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.4.3.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb @@ -6,8 +6,10 @@ SECTION = "tpm" DEPENDS = "autoconf-archive-native libgcrypt openssl" -SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "e294677f8993234d0adfa191a5cbf9c5b83cc60c724c233e3d631c26712abea0" +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-configure.ac-fix-compatibility-with-autoconf-2.70.patch \ + " +SRC_URI[sha256sum] = "78392be7309baf47f51b122f566ac915fd4d1760ea78571cba2e1484f9b5be17" inherit autotools pkgconfig systemd extrausers |