diff options
| -rw-r--r-- | catalog/meson.build | 10 | ||||
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | network/meson.build | 1 | ||||
| -rw-r--r-- | rules.d/meson.build | 1 | ||||
| -rw-r--r-- | shell-completion/bash/meson.build | 4 | ||||
| -rw-r--r-- | src/kernel-install/meson.build | 7 | ||||
| -rw-r--r-- | src/sysupdate/meson.build | 40 | ||||
| -rw-r--r-- | src/test/meson.build | 2 |
8 files changed, 41 insertions, 35 deletions
diff --git a/catalog/meson.build b/catalog/meson.build index 6a0a2193a2..9aacd20954 100644 --- a/catalog/meson.build +++ b/catalog/meson.build @@ -1,18 +1,24 @@ # SPDX-License-Identifier: LGPL-2.1-or-later in_files = [ - 'systemd.bg.catalog', 'systemd.be.catalog', 'systemd.be@latin.catalog', + 'systemd.bg.catalog', + 'systemd.catalog', + 'systemd.da.catalog', 'systemd.de.catalog', 'systemd.fr.catalog', + 'systemd.hr.catalog', + 'systemd.hu.catalog', 'systemd.it.catalog', + 'systemd.ko.catalog', 'systemd.pl.catalog', 'systemd.pt_BR.catalog', 'systemd.ru.catalog', + 'systemd.sr.catalog', 'systemd.zh_CN.catalog', 'systemd.zh_TW.catalog', - 'systemd.catalog'] +] support_url = get_option('support-url') support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url) diff --git a/meson.build b/meson.build index de3cd660f1..a856bb2f84 100644 --- a/meson.build +++ b/meson.build @@ -184,7 +184,6 @@ sysctldir = prefixdir / 'lib/sysctl.d' binfmtdir = prefixdir / 'lib/binfmt.d' modulesloaddir = prefixdir / 'lib/modules-load.d' networkdir = rootprefixdir / 'lib/systemd/network' -pkgincludedir = includedir / 'systemd' systemgeneratordir = rootlibexecdir / 'system-generators' usergeneratordir = prefixdir / 'lib/systemd/user-generators' systemenvgeneratordir = prefixdir / 'lib/systemd/system-environment-generators' @@ -316,7 +315,6 @@ conf.set10('FIRST_BOOT_FULL_PRESET', get_option('first- ##################################################################### cc = meson.get_compiler('c') -pkgconfig = import('pkgconfig') meson_build_sh = find_program('tools/meson-build.sh') want_tests = get_option('tests') @@ -1091,12 +1089,9 @@ else if clang_found clang = r.path() endif - # Assume that the required flags are supported by the found clang. - clang_supports_flags = clang_found else clang_found = true clang = cc.cmd_array() - clang_supports_flags = cc.has_argument('-Wno-compare-distinct-pointer-types') endif if clang_found @@ -2107,7 +2102,7 @@ install_libudev_static = static_library( if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 if conf.get('HAVE_TPM2') == 1 - cryptsetup_token_systemd_tpm2 = shared_library( + shared_library( 'cryptsetup-token-systemd-tpm2', cryptsetup_token_systemd_tpm2_sources, include_directories : includes, @@ -2125,7 +2120,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 endif if conf.get('HAVE_LIBFIDO2') == 1 - cryptsetup_token_systemd_fido2 = shared_library( + shared_library( 'cryptsetup-token-systemd-fido2', cryptsetup_token_systemd_fido2_sources, include_directories : includes, @@ -2143,7 +2138,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 endif if conf.get('HAVE_P11KIT') == 1 - cryptsetup_token_systemd_pkcs11 = shared_library( + shared_library( 'cryptsetup-token-systemd-pkcs11', cryptsetup_token_systemd_pkcs11_sources, include_directories : includes, diff --git a/network/meson.build b/network/meson.build index 4c6de20515..5e10c86372 100644 --- a/network/meson.build +++ b/network/meson.build @@ -3,6 +3,7 @@ if conf.get('ENABLE_NETWORKD') == 1 install_data('80-6rd-tunnel.network', '80-container-host0.network', + '80-container-vb.network', '80-container-ve.network', '80-container-vz.network', '80-ethernet.network.example', diff --git a/rules.d/meson.build b/rules.d/meson.build index 8d2878a36d..cba9dd4cc4 100644 --- a/rules.d/meson.build +++ b/rules.d/meson.build @@ -11,6 +11,7 @@ rules = [ '60-drm.rules', '60-evdev.rules', '60-fido-id.rules', + '60-infiniband.rules', '60-input-id.rules', '60-persistent-alsa.rules', '60-persistent-input.rules', diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 04945e28d6..0446be7302 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -31,11 +31,11 @@ items = [['busctl', ''], ['systemd-path', ''], ['systemd-run', ''], ['udevadm', ''], - ['kernel-install', 'ENABLE_KERNEL_INSTALL'], ['bootctl', 'HAVE_GNU_EFI'], ['coredumpctl', 'ENABLE_COREDUMP'], ['homectl', 'ENABLE_HOMED'], ['hostnamectl', 'ENABLE_HOSTNAMED'], + ['kernel-install', 'ENABLE_KERNEL_INSTALL'], ['localectl', 'ENABLE_LOCALED'], ['loginctl', 'ENABLE_LOGIND'], ['machinectl', 'ENABLE_MACHINED'], @@ -44,7 +44,9 @@ items = [['busctl', ''], ['portablectl', 'ENABLE_PORTABLED'], ['resolvectl', 'ENABLE_RESOLVE'], ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'], + ['systemd-dissect', 'HAVE_BLKID'], ['systemd-resolve', 'ENABLE_RESOLVE'], + ['systemd-sysext', 'ENABLE_SYSEXT'], ['timedatectl', 'ENABLE_TIMEDATED']] foreach item : items diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build index b0b6c27ede..f5db4432c9 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build @@ -12,10 +12,13 @@ loaderentry_install = custom_target( install_mode : 'rwxr-xr-x', install_dir : kernelinstalldir) -uki_copy_install = files('90-uki-copy.install') +kernel_install_files = files( + '50-depmod.install', + '90-uki-copy.install', +) if want_kernel_install - install_data('50-depmod.install', + install_data(kernel_install_files, install_mode : 'rwxr-xr-x', install_dir : kernelinstalldir) diff --git a/src/sysupdate/meson.build b/src/sysupdate/meson.build index 2b1a256026..2f8c2305da 100644 --- a/src/sysupdate/meson.build +++ b/src/sysupdate/meson.build @@ -1,22 +1,22 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_sysupdate_sources = files(''' - sysupdate-instance.c - sysupdate-instance.h - sysupdate-partition.c - sysupdate-partition.h - sysupdate-pattern.c - sysupdate-pattern.h - sysupdate-resource.c - sysupdate-resource.h - sysupdate-transfer.c - sysupdate-transfer.h - sysupdate-update-set.c - sysupdate-update-set.h - sysupdate-util.c - sysupdate-util.h - sysupdate-cache.c - sysupdate-cache.h - sysupdate.c - sysupdate.h -'''.split()) +systemd_sysupdate_sources = files( + 'sysupdate-cache.c', + 'sysupdate-cache.h', + 'sysupdate-instance.c', + 'sysupdate-instance.h', + 'sysupdate-partition.c', + 'sysupdate-partition.h', + 'sysupdate-pattern.c', + 'sysupdate-pattern.h', + 'sysupdate-resource.c', + 'sysupdate-resource.h', + 'sysupdate-transfer.c', + 'sysupdate-transfer.h', + 'sysupdate-update-set.c', + 'sysupdate-update-set.h', + 'sysupdate-util.c', + 'sysupdate-util.h', + 'sysupdate.c', + 'sysupdate.h', +) diff --git a/src/test/meson.build b/src/test/meson.build index dc9595ab09..34dbd6dcad 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -9,8 +9,6 @@ test_hashmap_ordered_c = custom_target( capture : true, build_by_default : want_tests != 'false') -test_include_dir = include_directories('.') - path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip() test_env = environment() test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map) |