diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-07-13 09:31:47 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-07-18 10:05:06 -0400 |
| commit | 18b9ad1f61f42d4558b89da6dc00c607630f2f48 (patch) | |
| tree | ee82b8754345f878caf39e6ae7a8afc554254373 | |
| parent | e7e157032bb5a9cb2d951fc6b28394d66cb513ad (diff) | |
| download | systemd-18b9ad1f61f42d4558b89da6dc00c607630f2f48.tar.gz | |
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.)
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/boot/efi/boot.c | 2 | ||||
| -rw-r--r-- | src/boot/efi/measure.c | 2 | ||||
| -rw-r--r-- | src/boot/efi/meson.build | 2 | ||||
| -rw-r--r-- | src/boot/efi/stub.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 20b27c8600..ba8bb81856 100644 --- 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 1e990b3825..9a02902428 100644 --- 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 b22d37b62d..8627c09077 100644 --- 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 5ef5b2d20b..b111aad852 100644 --- 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 bab5d46de9..bef416aa5c 100644 --- 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, |