From e594a3b154bd06c535a934a1cc7231b1ef76df73 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Dec 2019 21:31:41 +0100 Subject: repart: add new systemd-repart tool Fixes: #14052 --- meson.build | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 848140bb03..54820d3f6a 100644 --- a/meson.build +++ b/meson.build @@ -873,6 +873,17 @@ endif libmount = dependency('mount', version : fuzzer_build ? '>= 0' : '>= 2.30') +want_libfdisk = get_option('fdisk') +if want_libfdisk != 'false' and not skip_deps + libfdisk = dependency('fdisk', + required : want_libfdisk == 'true') + have = libfdisk.found() +else + have = false + libfdisk = [] +endif +conf.set10('HAVE_LIBFDISK', have) + want_seccomp = get_option('seccomp') if want_seccomp != 'false' and not skip_deps libseccomp = dependency('libseccomp', @@ -1279,6 +1290,18 @@ conf.set('DEFAULT_DNS_OVER_TLS_MODE', 'DNS_OVER_TLS_' + default_dns_over_tls.underscorify().to_upper()) substs.set('DEFAULT_DNS_OVER_TLS_MODE', default_dns_over_tls) +want_repart = get_option('repart') +if want_repart != 'false' + have = (conf.get('HAVE_OPENSSL') == 1 and + conf.get('HAVE_LIBFDISK') == 1) + if want_repart == 'true' and not have + error('repart support was requested, but dependencies are not available') + endif +else + have = false +endif +conf.set10('ENABLE_REPART', have) + want_importd = get_option('importd') if want_importd != 'false' have = (conf.get('HAVE_LIBCURL') == 1 and @@ -1535,6 +1558,7 @@ subdir('src/coredump') subdir('src/pstore') subdir('src/hostname') subdir('src/import') +subdir('src/partition') subdir('src/kernel-install') subdir('src/locale') subdir('src/machine') @@ -2381,6 +2405,21 @@ if conf.get('ENABLE_BINFMT') == 1 mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) endif +if conf.get('ENABLE_REPART') == 1 + executable('systemd-repart', + systemd_repart_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libcryptsetup, + libblkid, + libfdisk, + libopenssl], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) +endif + if conf.get('ENABLE_VCONSOLE') == 1 executable('systemd-vconsole-setup', 'src/vconsole/vconsole-setup.c', @@ -3276,6 +3315,7 @@ foreach tuple : [ ['libiptc'], ['elfutils'], ['binfmt'], + ['repart'], ['vconsole'], ['quotacheck'], ['tmpfiles'], -- cgit v1.2.1