diff options
| author | Gabríel Arthúr Pétursson <gabriel.petursson@marel.com> | 2024-01-03 16:55:18 +0100 |
|---|---|---|
| committer | Gabríel Arthúr Pétursson <gabriel.petursson@marel.com> | 2024-02-01 12:57:52 +0100 |
| commit | 47b425de0c1788266e105bf88190c4cb3c8a6d1e (patch) | |
| tree | 7ef40018882bb81b66799088524efd390eb2f378 | |
| parent | build(deps): bump actions/upload-artifact from 4.0.0 to 4.3.0 (diff) | |
| download | systemd-47b425de0c1788266e105bf88190c4cb3c8a6d1e.tar.xz systemd-47b425de0c1788266e105bf88190c4cb3c8a6d1e.zip | |
shared: Move cryptsetup-tpm2.[ch] from systemd-cryptsetup
| -rw-r--r-- | src/cryptsetup/meson.build | 4 | ||||
| -rw-r--r-- | src/shared/cryptsetup-tpm2.c (renamed from src/cryptsetup/cryptsetup-tpm2.c) | 0 | ||||
| -rw-r--r-- | src/shared/cryptsetup-tpm2.h (renamed from src/cryptsetup/cryptsetup-tpm2.h) | 0 | ||||
| -rw-r--r-- | src/shared/meson.build | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build index 90e2be7a91..9ccc0982b5 100644 --- a/src/cryptsetup/meson.build +++ b/src/cryptsetup/meson.build @@ -11,10 +11,6 @@ if conf.get('HAVE_P11KIT') == 1 systemd_cryptsetup_sources += files('cryptsetup-pkcs11.c') endif -if conf.get('HAVE_TPM2') == 1 - systemd_cryptsetup_sources += files('cryptsetup-tpm2.c') -endif - executables += [ executable_template + { 'name' : 'systemd-cryptsetup', diff --git a/src/cryptsetup/cryptsetup-tpm2.c b/src/shared/cryptsetup-tpm2.c index 297ef6fe4a..297ef6fe4a 100644 --- a/src/cryptsetup/cryptsetup-tpm2.c +++ b/src/shared/cryptsetup-tpm2.c diff --git a/src/cryptsetup/cryptsetup-tpm2.h b/src/shared/cryptsetup-tpm2.h index 0eaf9280ef..0eaf9280ef 100644 --- a/src/cryptsetup/cryptsetup-tpm2.h +++ b/src/shared/cryptsetup-tpm2.h diff --git a/src/shared/meson.build b/src/shared/meson.build index 2a39bb04df..dc9adeddc1 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -250,6 +250,10 @@ if conf.get('HAVE_LIBFIDO2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1 shared_sources += files('cryptsetup-fido2.c') endif +if conf.get('HAVE_TPM2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1 + shared_sources += files('cryptsetup-tpm2.c') +endif + generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh') ip_protocol_list_txt = custom_target( 'ip-protocol-list.txt', |