diff options
| author | Mike Yuan <me@yhndnzj.com> | 2024-11-12 19:30:38 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-11-13 00:21:33 +0100 |
| commit | e2f82f61510ac8cea86a32d269df346e24c55c3a (patch) | |
| tree | edd148a7b06208fe91b92d71fca48ebd8a32b5c4 /src/pcrlock | |
| parent | run0: when changing privileges to non-root, do not show superhero emoji (diff) | |
| download | systemd-e2f82f61510ac8cea86a32d269df346e24c55c3a.tar.xz systemd-e2f82f61510ac8cea86a32d269df346e24c55c3a.zip | |
various: check meson feature flag early
Prompted by https://github.com/systemd/systemd/pull/35110#discussion_r1835885340
Diffstat (limited to 'src/pcrlock')
| -rw-r--r-- | src/pcrlock/meson.build | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/pcrlock/meson.build b/src/pcrlock/meson.build index 8c8728a3a0..6533ef3ab8 100644 --- a/src/pcrlock/meson.build +++ b/src/pcrlock/meson.build @@ -1,12 +1,12 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +if conf.get('HAVE_OPENSSL') != 1 or conf.get('HAVE_TPM2') != 1 + subdir_done() +endif + executables += [ libexec_template + { 'name' : 'systemd-pcrlock', - 'conditions' : [ - 'HAVE_OPENSSL', - 'HAVE_TPM2' - ], 'sources' : files( 'pcrlock.c', 'pcrlock-firmware.c', @@ -19,18 +19,16 @@ executables += [ }, ] -if conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_TPM2') == 1 - install_data('pcrlock.d/350-action-efi-application.pcrlock', install_dir : pcrlockdir) - install_data('pcrlock.d/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock', install_dir : pcrlockdir / '400-secureboot-separator.pcrlock.d') - install_data('pcrlock.d/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock', install_dir : pcrlockdir / '400-secureboot-separator.pcrlock.d') - install_data('pcrlock.d/500-separator.pcrlock.d/300-0x00000000.pcrlock', install_dir : pcrlockdir / '500-separator.pcrlock.d') - install_data('pcrlock.d/500-separator.pcrlock.d/600-0xffffffff.pcrlock', install_dir : pcrlockdir / '500-separator.pcrlock.d') - install_data('pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock', install_dir : pcrlockdir / '700-action-efi-exit-boot-services.pcrlock.d') - install_data('pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock', install_dir : pcrlockdir / '700-action-efi-exit-boot-services.pcrlock.d') - install_data('pcrlock.d/750-enter-initrd.pcrlock', install_dir : pcrlockdir) - install_data('pcrlock.d/800-leave-initrd.pcrlock', install_dir : pcrlockdir) - install_data('pcrlock.d/850-sysinit.pcrlock', install_dir : pcrlockdir) - install_data('pcrlock.d/900-ready.pcrlock', install_dir : pcrlockdir) - install_data('pcrlock.d/950-shutdown.pcrlock', install_dir : pcrlockdir) - install_data('pcrlock.d/990-final.pcrlock', install_dir : pcrlockdir) -endif +install_data('pcrlock.d/350-action-efi-application.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock', install_dir : pcrlockdir / '400-secureboot-separator.pcrlock.d') +install_data('pcrlock.d/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock', install_dir : pcrlockdir / '400-secureboot-separator.pcrlock.d') +install_data('pcrlock.d/500-separator.pcrlock.d/300-0x00000000.pcrlock', install_dir : pcrlockdir / '500-separator.pcrlock.d') +install_data('pcrlock.d/500-separator.pcrlock.d/600-0xffffffff.pcrlock', install_dir : pcrlockdir / '500-separator.pcrlock.d') +install_data('pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock', install_dir : pcrlockdir / '700-action-efi-exit-boot-services.pcrlock.d') +install_data('pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock', install_dir : pcrlockdir / '700-action-efi-exit-boot-services.pcrlock.d') +install_data('pcrlock.d/750-enter-initrd.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/800-leave-initrd.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/850-sysinit.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/900-ready.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/950-shutdown.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/990-final.pcrlock', install_dir : pcrlockdir) |