build-sys: rename SD_BOOT_LOG_TPM to ENABLE_TPM

This makes it more like other configure defines.

Also, it fixes meson status output which was looking for HAVE_ and ENABLE_
prefixes only (the define under meson was OK, just the summary message was
wrong.)

diff --git a/meson.build b/meson.build
index 20b27c860017d4d736b797ceada30ddbf6b2f5eb..ba8bb8185685ffaa5f78560faccc2098b91e4809 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1008,7 +1008,7 @@ foreach pair : [['utmp',          'HAVE_UTMP'],
                 ['rfkill',        'ENABLE_RFKILL'],
                 ['ldconfig',      'ENABLE_LDCONFIG'],
                 ['efi',           'ENABLE_EFI'],
-                ['tpm',           'SD_BOOT_LOG_TPM'],
+                ['tpm',           'ENABLE_TPM'],
                 ['ima',           'HAVE_IMA'],
                 ['smack',         'HAVE_SMACK'],
                 ['gshadow',       'ENABLE_GSHADOW'],

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 1e990b38251261dc5bedb5540f1bde16c6d30541..9a0290242892aec3dff5f6755d035b3ee6190081 100644 (file)
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1650,7 +1650,7 @@ static EFI_STATUS image_start(EFI_HANDLE parent_image, const Config *config, con
                 loaded_image->LoadOptions = options;
                 loaded_image->LoadOptionsSize = (StrLen(loaded_image->LoadOptions)+1) * sizeof(CHAR16);
 
-#ifdef SD_BOOT_LOG_TPM
+#ifdef ENABLE_TPM
                 /* Try to log any options to the TPM, especially to catch manually edited options */
                 err = tpm_log_event(SD_TPM_PCR,
                                     (EFI_PHYSICAL_ADDRESS) loaded_image->LoadOptions,

diff --git a/src/boot/efi/measure.c b/src/boot/efi/measure.c
index b22d37b62d391eda42108e99f7c226d606a660af..8627c0907703a1df0f0d499cdbe0a7a38d82a40c 100644 (file)
--- a/src/boot/efi/measure.c
+++ b/src/boot/efi/measure.c
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef SD_BOOT_LOG_TPM
+#ifdef ENABLE_TPM
 
 #include <efi.h>
 #include <efilib.h>

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 5ef5b2d20b5afcb6233fead233f0ec1f02e76b50..b111aad8521aee19cdf551144084e593fcf30102 100644 (file)
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -64,7 +64,7 @@ if have_gnu_efi
         efi_conf = configuration_data()
         efi_conf.set_quoted('PACKAGE_VERSION', meson.project_version())
         efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-        efi_conf.set('SD_BOOT_LOG_TPM', get_option('tpm'))
+        efi_conf.set('ENABLE_TPM', get_option('tpm'))
         efi_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex'))
 
         efi_config_h = configure_file(

diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index bab5d46de9a6bc882ebbda3f27bc2076e307e3ea..bef416aa5c6cec87f8966a0f57c0a5d7d5a84a70 100644 (file)
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -87,7 +87,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
                         line[i] = options[i];
                 cmdline = line;
 
-#ifdef SD_BOOT_LOG_TPM
+#ifdef ENABLE_TPM
                 /* Try to log any options to the TPM, especially manually edited options */
                 err = tpm_log_event(SD_TPM_PCR,
                                     (EFI_PHYSICAL_ADDRESS) loaded_image->LoadOptions,