meson: add forgotten tpm support

diff --git a/meson.build b/meson.build
index 949f63611bd032193b41bc5214fd0f055ff244be..ae577660cd4df9a657c188c11e55fa17eb3a3516 100644 (file)
--- 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 d9f2f4be33391c9bf7c620622a4373ffe2839504..350be3cc88cb763a9978f100ab467860e11c04db 100644 (file)
--- 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]')