From 81fe141ba3b4266342e243580ac0d9fbca1ed960 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 25 Jun 2023 15:57:47 +0900 Subject: [PATCH] meson: move declarations of cryptsetup and friends --- meson.build | 82 +--------------------------------- src/cryptenroll/meson.build | 15 +++++++ src/cryptsetup/meson.build | 18 ++++++++ src/integritysetup/meson.build | 21 +++++++++ src/veritysetup/meson.build | 15 +++++++ 5 files changed, 71 insertions(+), 80 deletions(-) create mode 100644 src/integritysetup/meson.build create mode 100644 src/veritysetup/meson.build diff --git a/meson.build b/meson.build index eb00b228f9..eca9b4325c 100644 --- a/meson.build +++ b/meson.build @@ -2388,6 +2388,7 @@ subdir('src/hibernate-resume') subdir('src/home') subdir('src/hostname') subdir('src/import') +subdir('src/integritysetup') subdir('src/journal-remote') subdir('src/kernel-install') subdir('src/locale') @@ -2418,6 +2419,7 @@ subdir('src/timesync') subdir('src/tmpfiles') subdir('src/user-sessions') subdir('src/userdb') +subdir('src/veritysetup') subdir('src/xdg-autostart-generator') subdir('src/systemd') @@ -2577,86 +2579,6 @@ meson.add_install_script(meson_make_symlink, bindir / 'udevadm', libexecdir / 'systemd-udevd') -if conf.get('HAVE_LIBCRYPTSETUP') == 1 - executable( - 'systemd-cryptsetup', - systemd_cryptsetup_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup, - libopenssl, - libp11kit, - userspace], - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) - - executable( - 'systemd-cryptsetup-generator', - 'src/cryptsetup/cryptsetup-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : userspace, - install_rpath : pkglibdir, - install : true, - install_dir : systemgeneratordir) - - executable( - 'systemd-veritysetup', - 'src/veritysetup/veritysetup.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup, - userspace], - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) - - executable( - 'systemd-veritysetup-generator', - 'src/veritysetup/veritysetup-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : [userspace], - install_rpath : pkglibdir, - install : true, - install_dir : systemgeneratordir) - - public_programs += executable( - 'systemd-cryptenroll', - systemd_cryptenroll_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup, - libdl, - libopenssl, - libp11kit, - userspace], - install_rpath : pkglibdir, - install : true) - - executable( - 'systemd-integritysetup', - ['src/integritysetup/integritysetup.c', 'src/integritysetup/integrity-util.c'], - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup, - userspace], - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) - - executable( - 'systemd-integritysetup-generator', - ['src/integritysetup/integritysetup-generator.c', 'src/integritysetup/integrity-util.c'], - include_directories : includes, - link_with : [libshared], - dependencies : userspace, - install_rpath : pkglibdir, - install : true, - install_dir : systemgeneratordir) -endif - if conf.get('HAVE_SYSV_COMPAT') == 1 exe = executable( 'systemd-sysv-generator', diff --git a/src/cryptenroll/meson.build b/src/cryptenroll/meson.build index 9080af0db9..fa171ea47a 100644 --- a/src/cryptenroll/meson.build +++ b/src/cryptenroll/meson.build @@ -19,3 +19,18 @@ endif if conf.get('HAVE_TPM2') == 1 systemd_cryptenroll_sources += files('cryptenroll-tpm2.c') endif + +executables += [ + executable_template + { + 'name' : 'systemd-cryptenroll', + 'public' : true, + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : systemd_cryptenroll_sources, + 'dependencies' : [ + libcryptsetup, + libdl, + libopenssl, + libp11kit, + ], + }, +] diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build index 2a8e43a33a..6f7aa3c796 100644 --- a/src/cryptsetup/meson.build +++ b/src/cryptsetup/meson.build @@ -14,3 +14,21 @@ endif if conf.get('HAVE_TPM2') == 1 systemd_cryptsetup_sources += files('cryptsetup-tpm2.c') endif + +executables += [ + libexec_template + { + 'name' : 'systemd-cryptsetup', + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : systemd_cryptsetup_sources, + 'dependencies' : [ + libcryptsetup, + libopenssl, + libp11kit, + ], + }, + generator_template + { + 'name' : 'systemd-cryptsetup-generator', + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : files('cryptsetup-generator.c'), + }, +] diff --git a/src/integritysetup/meson.build b/src/integritysetup/meson.build new file mode 100644 index 0000000000..6b9d78d4e8 --- /dev/null +++ b/src/integritysetup/meson.build @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +executables += [ + libexec_template + { + 'name' : 'systemd-integritysetup', + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : files( + 'integrity-util.c', + 'integritysetup.c', + ), + 'dependencies' : libcryptsetup, + }, + generator_template + { + 'name' : 'systemd-integritysetup-generator', + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : files( + 'integrity-util.c', + 'integritysetup-generator.c', + ), + }, +] diff --git a/src/veritysetup/meson.build b/src/veritysetup/meson.build new file mode 100644 index 0000000000..a7468dfe06 --- /dev/null +++ b/src/veritysetup/meson.build @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +executables += [ + libexec_template + { + 'name' : 'systemd-veritysetup', + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : files('veritysetup.c'), + 'dependencies' : libcryptsetup, + }, + generator_template + { + 'name' : 'systemd-veritysetup-generator', + 'conditions' : ['HAVE_LIBCRYPTSETUP'], + 'sources' : files('veritysetup-generator.c'), + }, +]