shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

build-sys: enable tpm by default

Browse Source 
It's been on in Fedora for ages, and it seems strange to have
a feature that's off by default.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-07-13 19:37:07 -04:00
parent 303608c1bc
commit 7d77b8880d
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 have_tpm=no
AC_ARG_ENABLE([tpm], AS_HELP_STRING([--enable-tpm], [enable optional TPM support]), AC_ARG_ENABLE(tpm, AS_HELP_STRING([--disable-tpm], [disable optional support]))
[case "${enableval}" in if test "x${enable_tpm}" != xno ; then
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_DEFINE(SD_BOOT_LOG_TPM, 1, [Define if TPM should be used to log events and extend the registers]) AC_DEFINE(SD_BOOT_LOG_TPM, 1, [Define if TPM should be used to log events and extend the registers])
have_tpm=yes
fi fi
AC_ARG_WITH(tpm-pcrindex, AC_ARG_WITH(tpm-pcrindex,

2
meson_options.txt
View File

@ -47,7 +47,7 @@ option('resolve', type : 'boolean',
description : 'systemd-resolved stack') description : 'systemd-resolved stack')
option('efi', type : 'boolean', option('efi', type : 'boolean',
description : 'enable systemd-boot and bootctl') 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') description : 'TPM should be used to log events and extend the registers')
option('environment-d', type : 'boolean', option('environment-d', type : 'boolean',
description : 'support for environment.d') description : 'support for environment.d')