summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-24 19:28:04 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-24 19:28:04 -0400
commit80c6fce81cd1256cbc65bf567aaaa42b6cd60691 (patch)
treefe4138420c9d239f88c0efd22fa016ca77b7818d
parent41afb5eb7214727301132aedc381831fbfc78e37 (diff)
meson: add forgotten tpm support
-rw-r--r--meson.build3
-rw-r--r--meson_options.txt4
2 files changed, 7 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index 949f63611b..ae577660cd 100644
--- a/meson.build
+++ b/meson.build
@@ -986,6 +986,7 @@ foreach pair : [['utmp', 'HAVE_UTMP'],
['rfkill', 'ENABLE_RFKILL'],
['ldconfig', 'ENABLE_LDCONFIG'],
['efi', 'ENABLE_EFI'],
+ ['tpm', 'SD_BOOT_LOG_TPM'],
['ima', 'HAVE_IMA'],
]
@@ -1023,6 +1024,8 @@ if get_option('efi')
conf.set('ENABLE_EFI', 1)
conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
+
+ conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int())
endif
#####################################################################
diff --git a/meson_options.txt b/meson_options.txt
index d9f2f4be33..350be3cc88 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -45,6 +45,8 @@ option('resolve', type : 'boolean',
description : 'systemd-resolved stack')
option('efi', type : 'boolean',
description : 'enable systemd-boot and bootctl')
+option('tpm', type : 'boolean', value : false,
+ description : 'TPM should be used to log events and extend the registers')
option('environment-d', type : 'boolean',
description : 'support for environment.d')
option('binfmt', type : 'boolean',
@@ -230,6 +232,8 @@ option('efi-ldsdir', type : 'string',
description : 'path to the EFI lds directory')
option('efi-includedir', type : 'string', value : '/usr/include/efi',
description : 'path to the EFI header directory')
+option('tpm-pcrindex', type : 'string', value : '8',
+ description : 'TPM PCR register number to use')
option('bashcompletiondir', type : 'string',
description : 'directory for bash completion scripts ["no" disables]')