| Andrew Geissler | f1e4406 | 2021-04-15 15:52:46 -0500 | [diff] [blame] | 1 | Don't check for tscd deamon on host. |
| 2 | |
| 3 | Upstream-Status: OE Specific |
| 4 | |
| 5 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
| 6 | |
| 7 | Index: git/configure.ac |
| 8 | =================================================================== |
| 9 | --- git.orig/configure.ac |
| 10 | +++ git/configure.ac |
| 11 | @@ -179,15 +179,6 @@ AC_SUBST([LIBTPMS_LIBS]) |
| 12 | AC_CHECK_LIB(c, clock_gettime, LIBRT_LIBS="", LIBRT_LIBS="-lrt") |
| 13 | AC_SUBST([LIBRT_LIBS]) |
| 14 | |
| 15 | -AC_PATH_PROG([TCSD], tcsd) |
| 16 | -if test "x$TCSD" = "x"; then |
| 17 | - have_tcsd=no |
| 18 | - AC_MSG_WARN([tcsd could not be found; typically need it for tss user account and tests]) |
| 19 | -else |
| 20 | - have_tcsd=yes |
| 21 | -fi |
| 22 | -AM_CONDITIONAL([HAVE_TCSD], test "$have_tcsd" != "no") |
| 23 | - |
| 24 | dnl We either need netstat (more common across systems) or 'ss' for test cases |
| 25 | AC_PATH_PROG([NETSTAT], [netstat]) |
| 26 | if test "x$NETSTAT" = "x"; then |
| 27 | @@ -440,23 +431,6 @@ AC_ARG_WITH([tss-group], |
| 28 | [TSS_GROUP="tss"] |
| 29 | ) |
| 30 | |
| 31 | -case $have_tcsd in |
| 32 | -yes) |
| 33 | - AC_MSG_CHECKING([whether TSS_USER $TSS_USER is available]) |
| 34 | - if ! test $(id -u $TSS_USER); then |
| 35 | - AC_MSG_ERROR(["$TSS_USER is not available"]) |
| 36 | - else |
| 37 | - AC_MSG_RESULT([yes]) |
| 38 | - fi |
| 39 | - AC_MSG_CHECKING([whether TSS_GROUP $TSS_GROUP is available]) |
| 40 | - if ! test $(id -g $TSS_GROUP); then |
| 41 | - AC_MSG_ERROR(["$TSS_GROUP is not available"]) |
| 42 | - else |
| 43 | - AC_MSG_RESULT([yes]) |
| 44 | - fi |
| 45 | - ;; |
| 46 | -esac |
| 47 | - |
| 48 | AC_SUBST([TSS_USER]) |
| 49 | AC_SUBST([TSS_GROUP]) |
| 50 | |
| 51 | Index: git/tests/Makefile.am |
| 52 | =================================================================== |
| 53 | --- git.orig/tests/Makefile.am |
| 54 | +++ git/tests/Makefile.am |
| 55 | @@ -83,10 +83,6 @@ TESTS += \ |
| 56 | test_tpm2_swtpm_cert \ |
| 57 | test_tpm2_swtpm_cert_ecc \ |
| 58 | test_tpm2_swtpm_setup_create_cert |
| 59 | -if HAVE_TCSD |
| 60 | -TESTS += \ |
| 61 | - test_tpm2_samples_create_tpmca |
| 62 | -endif |
| 63 | endif |
| 64 | |
| 65 | EXTRA_DIST=$(TESTS) \ |