From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 13 Jul 2017 23:37:07 +0000 (-0400)
Subject: build-sys: enable tpm by default
X-Git-Tag: v235~328^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6367%2Fhead;p=thirdparty%2Fsystemd.git

build-sys: enable tpm by default

It's been on in Fedora for ages, and it seems strange to have
a feature that's off by default.
---

diff --git a/configure.ac b/configure.ac
index c7537aafc0c..eafe77e635b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1431,16 +1431,10 @@ AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes])
 
 # ------------------------------------------------------------------------------
 have_tpm=no
-AC_ARG_ENABLE([tpm], AS_HELP_STRING([--enable-tpm], [enable optional TPM support]),
-                [case "${enableval}" in
-                        yes) have_tpm=yes ;;
-                        no) have_tpm=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --enable-tpm) ;;
-                esac],
-                [have_tpm=no])
-
-if test "x${have_tpm}" != xno ; then
+AC_ARG_ENABLE(tpm, AS_HELP_STRING([--disable-tpm], [disable optional support]))
+if test "x${enable_tpm}" != xno ; then
         AC_DEFINE(SD_BOOT_LOG_TPM, 1, [Define if TPM should be used to log events and extend the registers])
+        have_tpm=yes
 fi
 
 AC_ARG_WITH(tpm-pcrindex,
diff --git a/meson_options.txt b/meson_options.txt
index 1594fec41f5..0cd8fb02e7f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -47,7 +47,7 @@ option('resolve', type : 'boolean',
        description : 'systemd-resolved stack')
 option('efi', type : 'boolean',
        description : 'enable systemd-boot and bootctl')
-option('tpm', type : 'boolean', value : false,
+option('tpm', type : 'boolean', value : true,
        description : 'TPM should be used to log events and extend the registers')
 option('environment-d', type : 'boolean',
        description : 'support for environment.d')