From 80c6fce81cd1256cbc65bf567aaaa42b6cd60691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 24 Apr 2017 19:28:04 -0400 Subject: [PATCH] meson: add forgotten tpm support --- meson.build | 3 +++ meson_options.txt | 4 ++++ 2 files changed, 7 insertions(+) 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]')