picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6367 from keszybz/enable-tpm

Browse source 
build-sys: enable tpm by default
This commit is contained in:
Lennart Poettering 2017-07-17 10:03:13 +02:00 committed by GitHub
parent 981778e212 7d77b8880d
commit 0b9b1771c6
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -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,

2
meson_options.txt
View file

@ -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')