shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

build-sys: rename SD_BOOT_LOG_TPM to ENABLE_TPM

Browse Source 
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.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-07-13 09:31:47 -04:00
parent e7e157032b
commit 18b9ad1f61
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -1008,7 +1008,7 @@ foreach pair : [['utmp', 'HAVE_UTMP'],
['rfkill', 'ENABLE_RFKILL'], ['rfkill', 'ENABLE_RFKILL'],
['ldconfig', 'ENABLE_LDCONFIG'], ['ldconfig', 'ENABLE_LDCONFIG'],
['efi', 'ENABLE_EFI'], ['efi', 'ENABLE_EFI'],
['tpm', 'SD_BOOT_LOG_TPM'], ['tpm', 'ENABLE_TPM'],
['ima', 'HAVE_IMA'], ['ima', 'HAVE_IMA'],
['smack', 'HAVE_SMACK'], ['smack', 'HAVE_SMACK'],
['gshadow', 'ENABLE_GSHADOW'], ['gshadow', 'ENABLE_GSHADOW'],

2
src/boot/efi/boot.c
View File

@ -1650,7 +1650,7 @@ static EFI_STATUS image_start(EFI_HANDLE parent_image, const Config *config, con
loaded_image->LoadOptions = options; loaded_image->LoadOptions = options;
loaded_image->LoadOptionsSize = (StrLen(loaded_image->LoadOptions)+1) * sizeof(CHAR16); 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 */ /* Try to log any options to the TPM, especially to catch manually edited options */
err = tpm_log_event(SD_TPM_PCR, err = tpm_log_event(SD_TPM_PCR,
(EFI_PHYSICAL_ADDRESS) loaded_image->LoadOptions, (EFI_PHYSICAL_ADDRESS) loaded_image->LoadOptions,

2
src/boot/efi/measure.c
View File

@ -11,7 +11,7 @@
* *
*/ */
#ifdef SD_BOOT_LOG_TPM #ifdef ENABLE_TPM
#include <efi.h> #include <efi.h>
#include <efilib.h> #include <efilib.h>

2
src/boot/efi/meson.build
View File

@ -64,7 +64,7 @@ if have_gnu_efi
efi_conf = configuration_data() efi_conf = configuration_data()
efi_conf.set_quoted('PACKAGE_VERSION', meson.project_version()) efi_conf.set_quoted('PACKAGE_VERSION', meson.project_version())
efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) 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_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex'))
efi_config_h = configure_file( efi_config_h = configure_file(

2
src/boot/efi/stub.c
View File

@ -87,7 +87,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
line[i] = options[i]; line[i] = options[i];
cmdline = line; cmdline = line;
#ifdef SD_BOOT_LOG_TPM #ifdef ENABLE_TPM
/* Try to log any options to the TPM, especially manually edited options */ /* Try to log any options to the TPM, especially manually edited options */
err = tpm_log_event(SD_TPM_PCR, err = tpm_log_event(SD_TPM_PCR,
(EFI_PHYSICAL_ADDRESS) loaded_image->LoadOptions, (EFI_PHYSICAL_ADDRESS) loaded_image->LoadOptions,