SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust naming of meson variables and allow systemd-report* binaries to be built standalone (#42874)

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-07-07 21:35:41 +02:00
committed by GitHub
parent a977bf4d06 e785d81c1b
commit 6b325a3613
37 changed files with 185 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.packit.yml
+1 -1
View File
@@ -51,7 +51,7 @@ jobs:
trigger: pull_request
fmf_url: https://src.fedoraproject.org/rpms/systemd
# This is automatically updated by tools/fetch-distro.py --update fedora
fmf_ref: 45c16dd369c961b70664e473552def34d5469664
fmf_ref: 57cbcf979ce2dd872a871c59e87d2c65dfa996e6
targets:
- fedora-rawhide-x86_64
# testing-farm in the Fedora repository is explicitly configured to use testing-farm bare metal runners as
meson.build
+11 -11
View File
@@ -1815,7 +1815,7 @@ catalogs = []
modules = [] # nss, pam, and other plugins
executables = []
executables_by_name = {}
objects_by_name = {}
exported_by_name = {}
fuzzer_exes = []
sources = []
@@ -2276,7 +2276,7 @@ foreach dict : executables
continue
endif
exe_sources = dict.get('sources', []) + dict.get('extract', [])
exe_sources = dict.get('sources', []) + dict.get('export', [])
foreach bpf_name : dict.get('bpf_programs', [])
if bpf_name in bpf_programs_by_name
@@ -2287,7 +2287,7 @@ foreach dict : executables
kwargs = {}
foreach key, val : dict
if key in ['name', 'dbus', 'public', 'conditions', 'type', 'suite',
'timeout', 'parallel', 'objects', 'sources', 'extract',
'timeout', 'parallel', 'sources', 'import', 'export',
'include_directories', 'build_by_default', 'install',
'bpf_programs']
continue
@@ -2305,9 +2305,9 @@ foreach dict : executables
include_directories += fs.parent(exe_sources[0])
endif
foreach val : dict.get('objects', [])
obj = objects_by_name[val]
kwargs += { 'objects' : kwargs.get('objects', []) + obj['objects'] }
foreach val : dict.get('import', [])
obj = exported_by_name[val]
kwargs += { 'objects' : kwargs.get('objects', []) + obj['exported'] }
include_directories += obj['include_directories']
endforeach
@@ -2354,11 +2354,11 @@ foreach dict : executables
sources += exe_sources
endif
if dict.has_key('extract')
objects_by_name += {
if 'export' in dict
exported_by_name += {
name : {
'objects' : exe.extract_objects(dict['extract']),
'include_directories' : fs.parent(dict['extract'][0]),
'exported' : exe.extract_objects(dict['export']),
'include_directories' : fs.parent(dict['export'][0]),
}
}
endif
@@ -2718,7 +2718,7 @@ if meson.version().version_compare('>=1.4.0')
uniq = {}
foreach source : sources
if uniq.has_key(source.full_path())
if source.full_path() in uniq
continue
endif
uniq += {source.full_path(): source}
mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf
+1 -1
View File
@@ -9,5 +9,5 @@ Profiles=!hyperscale
Environment=
GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
GIT_BRANCH=rawhide
GIT_COMMIT=45c16dd369c961b70664e473552def34d5469664
GIT_COMMIT=57cbcf979ce2dd872a871c59e87d2c65dfa996e6
PKG_SUBDIR=fedora
src/analyze/meson.build
+3 -3
View File
@@ -40,7 +40,7 @@ systemd_analyze_sources = files(
'analyze-verify.c',
'analyze.c',
)
systemd_analyze_extract_sources = files(
systemd_analyze_export_sources = files(
'analyze-verify-util.c'
)
@@ -49,7 +49,7 @@ executables += [
'name' : 'systemd-analyze',
'public' : conf.get('ENABLE_ANALYZE') == 1,
'sources' : systemd_analyze_sources,
'extract' : systemd_analyze_extract_sources,
'export' : systemd_analyze_export_sources,
'include_directories' : core_includes,
'link_with' : [
libcore,
@@ -63,6 +63,6 @@ executables += [
},
core_test_template + {
'sources' : files('test-verify.c'),
'objects' : ['systemd-analyze'],
'import' : ['systemd-analyze'],
},
]
src/busctl/meson.build
+3 -3
View File
@@ -3,7 +3,7 @@
busctl_sources = files(
'busctl.c',
)
busctl_extract_sources = files(
busctl_export_sources = files(
'busctl-introspect.c',
)
@@ -12,10 +12,10 @@ executables += [
'name' : 'busctl',
'public' : true,
'sources' : busctl_sources,
'extract' : busctl_extract_sources,
'export' : busctl_export_sources,
},
test_template + {
'sources' : files('test-busctl-introspect.c'),
'objects' : ['busctl'],
'import' : ['busctl'],
},
]
src/coredump/meson.build
+3 -3
View File
@@ -14,7 +14,7 @@ systemd_coredump_sources = files(
'coredump-send.c',
'coredump-submit.c',
)
systemd_coredump_extract_sources = files(
systemd_coredump_export_sources = files(
'coredump-vacuum.c',
)
@@ -36,7 +36,7 @@ executables += [
libexec_template + {
'name' : 'systemd-coredump',
'sources' : systemd_coredump_sources,
'extract' : systemd_coredump_extract_sources,
'export' : systemd_coredump_export_sources,
'link_with' : [libshared],
'dependencies' : [
common_dependencies,
@@ -52,7 +52,7 @@ executables += [
},
test_template + {
'sources' : files('test-coredump-vacuum.c'),
'objects' : ['systemd-coredump'],
'import' : ['systemd-coredump'],
'type' : 'manual',
},
]
src/hibernate-resume/meson.build
+2 -2
View File
@@ -8,11 +8,11 @@ executables += [
libexec_template + {
'name' : 'systemd-hibernate-resume',
'sources' : files('hibernate-resume.c'),
'extract' : files('hibernate-resume-config.c'),
'export' : files('hibernate-resume-config.c'),
},
generator_template + {
'name' : 'systemd-hibernate-resume-generator',
'sources' : files('hibernate-resume-generator.c'),
'objects' : ['systemd-hibernate-resume'],
'import' : ['systemd-hibernate-resume'],
},
]
src/home/meson.build
+7 -7
View File
@@ -16,7 +16,7 @@ systemd_homed_sources = files(
'homed.c',
'user-record-sign.c',
)
systemd_homed_extract_sources = files(
systemd_homed_export_sources = files(
'home-util.c',
'user-record-password-quality.c',
'user-record-util.c',
@@ -51,7 +51,7 @@ homectl_sources = files(
'homectl.c',
)
homectl_extract = files(
homectl_export_sources = files(
'homectl-prompts.c',
)
@@ -66,13 +66,13 @@ executables += [
'name' : 'systemd-homed',
'dbus' : true,
'sources' : systemd_homed_sources,
'extract' : systemd_homed_extract_sources,
'export' : systemd_homed_export_sources,
'dependencies' : libopenssl_cflags,
},
libexec_template + {
'name' : 'systemd-homework',
'sources' : systemd_homework_sources,
'objects' : ['systemd-homed'],
'import' : ['systemd-homed'],
'dependencies' : [
libblkid_cflags,
libcryptsetup_cflags,
@@ -86,8 +86,8 @@ executables += [
'name' : 'homectl',
'public' : true,
'sources' : homectl_sources,
'extract' : homectl_extract,
'objects' : ['systemd-homed'],
'export' : homectl_export_sources,
'import' : ['systemd-homed'],
'dependencies' : [
libfido2_cflags,
libopenssl_cflags,
@@ -96,7 +96,7 @@ executables += [
},
test_template + {
'sources' : files('test-homectl-prompts.c'),
'objects' : ['homectl'],
'import' : ['homectl'],
'type' : 'manual',
},
test_template + {
src/imds/meson.build
+3 -3
View File
@@ -9,7 +9,7 @@ executables += [
'name' : 'systemd-imdsd',
'public' : true,
'sources' : files('imdsd.c'),
'extract' : files('imds-util.c'),
'export' : files('imds-util.c'),
'dependencies' : [
libcurl_cflags,
],
@@ -20,12 +20,12 @@ executables += [
'sources' : files(
'imds-tool.c',
'imds-tool-metrics.c'),
'objects' : ['systemd-imdsd'],
'import' : ['systemd-imdsd'],
},
generator_template + {
'name' : 'systemd-imds-generator',
'sources' : files('imds-generator.c'),
'objects' : ['systemd-imdsd'],
'import' : ['systemd-imdsd'],
},
]
src/import/meson.build
+8 -8
View File
@@ -12,7 +12,7 @@ executables += [
'importd.c',
'oci-util.c',
),
'extract' : files(
'export' : files(
'oci-util.c',
'import-common.c',
'qcow2-util.c',
@@ -33,7 +33,7 @@ executables += [
'pull-raw.c',
'pull-tar.c',
),
'objects' : ['systemd-importd'],
'import' : ['systemd-importd'],
'dependencies' : [
libcurl_cflags,
libopenssl_cflags,
@@ -47,7 +47,7 @@ executables += [
'import-raw.c',
'import-tar.c',
),
'objects' : ['systemd-importd'],
'import' : ['systemd-importd'],
},
libexec_template + {
'name' : 'systemd-import-fs',
@@ -55,7 +55,7 @@ executables += [
'sources' : files(
'import-fs.c',
),
'objects' : ['systemd-importd'],
'import' : ['systemd-importd'],
},
libexec_template + {
'name' : 'systemd-export',
@@ -65,13 +65,13 @@ executables += [
'export-tar.c',
'export-raw.c',
),
'objects' : ['systemd-importd'],
'import' : ['systemd-importd'],
},
executable_template + {
'name' : 'importctl',
'public' : true,
'sources' : files('importctl.c'),
'objects': ['systemd-importd'],
'import' : ['systemd-importd'],
},
generator_template + {
'name' : 'systemd-import-generator',
@@ -86,12 +86,12 @@ executables += [
},
test_template + {
'sources' : files('test-qcow2.c'),
'objects' : ['systemd-importd'],
'import' : ['systemd-importd'],
'type' : 'manual',
},
test_template + {
'sources' : files('test-oci-util.c'),
'objects': ['systemd-importd'],
'import' : ['systemd-importd'],
},
]
src/integritysetup/meson.build
+2 -2
View File
@@ -8,12 +8,12 @@ executables += [
libexec_template + {
'name' : 'systemd-integritysetup',
'sources' : files('integritysetup.c'),
'extract' : files('integrity-util.c'),
'export' : files('integrity-util.c'),
'dependencies' : libcryptsetup_cflags,
},
generator_template + {
'name' : 'systemd-integritysetup-generator',
'sources' : files('integritysetup-generator.c'),
'objects' : ['systemd-integritysetup'],
'import' : ['systemd-integritysetup'],
},
]
src/journal-remote/meson.build
+7 -7
View File
@@ -5,7 +5,7 @@ systemd_journal_gatewayd_sources = files(
)
systemd_journal_remote_sources = files('journal-remote-main.c')
systemd_journal_remote_extract_sources = files(
systemd_journal_remote_export_sources = files(
'journal-compression-util.c',
'journal-remote-parse.c',
'journal-remote-write.c',
@@ -16,7 +16,7 @@ systemd_journal_upload_sources = files(
'journal-upload-journal.c',
'journal-upload.c',
)
systemd_journal_upload_extract_sources = files(
systemd_journal_upload_export_sources = files(
'journal-header-util.c',
)
@@ -46,7 +46,7 @@ executables += [
# Instead, we make sure we don't install it when the remote feature is disabled.
'install' : conf.get('ENABLE_REMOTE') == 1,
'sources' : systemd_journal_remote_sources,
'extract' : systemd_journal_remote_extract_sources,
'export' : systemd_journal_remote_export_sources,
'dependencies' : common_deps + [libmicrohttpd_cflags],
},
libexec_template + {
@@ -57,8 +57,8 @@ executables += [
'HAVE_LIBCURL',
],
'sources' : systemd_journal_upload_sources,
'extract' : systemd_journal_upload_extract_sources,
'objects' : ['systemd-journal-remote'],
'export' : systemd_journal_upload_export_sources,
'import' : ['systemd-journal-remote'],
'dependencies' : [
common_deps,
libcurl_cflags,
@@ -67,11 +67,11 @@ executables += [
test_template + {
'sources' : files('test-journal-header-util.c'),
'conditions' : ['ENABLE_REMOTE', 'HAVE_LIBCURL'],
'objects' : ['systemd-journal-upload'],
'import' : ['systemd-journal-upload'],
},
fuzz_template + {
'sources' : files('fuzz-journal-remote.c'),
'objects' : ['systemd-journal-remote'],
'import' : ['systemd-journal-remote'],
'dependencies' : common_deps + [libmicrohttpd_cflags],
},
]
src/journal/meson.build
+9 -9
View File
@@ -3,7 +3,7 @@
systemd_journald_sources = files(
'journald.c',
)
systemd_journald_extract_sources = files(
systemd_journald_export_sources = files(
'audit-type.c',
'journald-audit.c',
'journald-client.c',
@@ -28,7 +28,7 @@ journald_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += journald_gperf_c
systemd_journald_extract_sources += journald_gperf_c
systemd_journald_export_sources += journald_gperf_c
generate_audit_type_list = files('generate-audit_type-list.sh')
generate_audit_type_command = [env, 'bash', generate_audit_type_list, cpp]
@@ -53,7 +53,7 @@ audit_type_to_name = custom_target(
capture : true)
generated_sources += audit_type_to_name
systemd_journald_extract_sources += audit_type_to_name
systemd_journald_export_sources += audit_type_to_name
journalctl_sources = files(
'journalctl.c',
@@ -78,11 +78,11 @@ else
endif
journal_test_template = test_template + {
'objects' : ['systemd-journald'],
'import' : ['systemd-journald'],
}
journal_fuzz_template = fuzz_template + {
'objects' : [
'import' : [
'fuzz-journald-audit',
'systemd-journald',
],
@@ -93,7 +93,7 @@ executables += [
libexec_template + {
'name' : 'systemd-journald',
'sources' : systemd_journald_sources,
'extract' : systemd_journald_extract_sources,
'export' : systemd_journald_export_sources,
'dependencies' : [
libacl_cflags,
libaudit_cflags,
@@ -117,7 +117,7 @@ executables += [
'name' : 'systemd-cat',
'public' : true,
'sources' : files('cat.c'),
'objects' : ['systemd-journald'],
'import' : ['systemd-journald'],
},
executable_template + {
'name' : 'journalctl',
@@ -168,8 +168,8 @@ executables += [
fuzz_template + {
'sources' : files('fuzz-journald-audit.c'),
# fuzz-journald-util.c is shared with the other fuzzers below.
'extract' : files('fuzz-journald-util.c'),
'objects' : ['systemd-journald'],
'export' : files('fuzz-journald-util.c'),
'import' : ['systemd-journald'],
},
journal_fuzz_template + {
'sources' : files('fuzz-journald-kmsg.c'),
src/libsystemd-network/meson.build
+3 -3
View File
@@ -116,11 +116,11 @@ executables += [
},
network_test_template + {
'sources' : files('test-ndisc-ra.c'),
'extract' : files('icmp6-test-util.c'),
'export' : files('icmp6-test-util.c'),
},
network_test_template + {
'sources' : files('test-ndisc-rs.c'),
'objects' : ['test-ndisc-ra'],
'import' : ['test-ndisc-ra'],
},
network_test_template + {
'sources' : files('test-ndisc-send.c'),
@@ -146,6 +146,6 @@ executables += [
},
network_fuzz_template + {
'sources' : files('fuzz-ndisc-rs.c'),
'objects' : ['test-ndisc-ra'],
'import' : ['test-ndisc-ra'],
},
]
src/locale/meson.build
+3 -3
View File
@@ -7,7 +7,7 @@ endif
systemd_localed_sources = files(
'localed.c'
)
systemd_localed_extract_sources = files(
systemd_localed_export_sources = files(
'localed-util.c',
'xkbcommon-util.c',
)
@@ -29,7 +29,7 @@ executables += [
'name' : 'systemd-localed',
'dbus' : true,
'sources' : systemd_localed_sources,
'extract' : systemd_localed_extract_sources,
'export' : systemd_localed_export_sources,
'dependencies' : libxkbcommon_deps,
},
executable_template + {
@@ -39,7 +39,7 @@ executables += [
},
test_template + {
'sources' : files('test-localed-util.c'),
'objects' : ['systemd-localed'],
'import' : ['systemd-localed'],
'dependencies' : libxkbcommon_deps,
},
]
src/login/meson.build
+4 -4
View File
@@ -7,7 +7,7 @@ endif
systemd_logind_sources = files(
'logind.c',
)
systemd_logind_extract_sources = files(
systemd_logind_export_sources = files(
'logind-action.c',
'logind-brightness.c',
'logind-button.c',
@@ -35,7 +35,7 @@ logind_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += logind_gperf_c
systemd_logind_extract_sources += [logind_gperf_c]
systemd_logind_export_sources += [logind_gperf_c]
loginctl_sources = files(
'loginctl.c',
@@ -47,7 +47,7 @@ executables += [
'name' : 'systemd-logind',
'dbus' : true,
'sources' : systemd_logind_sources,
'extract' : systemd_logind_extract_sources,
'export' : systemd_logind_export_sources,
'dependencies' : [
libacl_cflags,
],
@@ -77,7 +77,7 @@ executables += [
},
test_template + {
'sources' : files('test-login-tables.c'),
'objects' : ['systemd-logind'],
'import' : ['systemd-logind'],
},
test_template + {
'sources' : files('test-session-properties.c'),
src/machine/meson.build
+3 -3
View File
@@ -7,7 +7,7 @@ endif
systemd_machined_sources = files(
'machined.c'
)
systemd_machined_extract_sources = files(
systemd_machined_export_sources = files(
'image.c',
'image-dbus.c',
'image-varlink.c',
@@ -26,7 +26,7 @@ executables += [
'name' : 'systemd-machined',
'dbus' : true,
'sources' : systemd_machined_sources,
'extract' : systemd_machined_extract_sources,
'export' : systemd_machined_export_sources,
},
executable_template + {
'name' : 'machinectl',
@@ -40,7 +40,7 @@ executables += [
},
test_template + {
'sources' : files('test-machine-tables.c'),
'objects' : ['systemd-machined'],
'import' : ['systemd-machined'],
},
]
src/network/meson.build
+7 -7
View File
@@ -3,7 +3,7 @@
systemd_networkd_sources = files(
'networkd.c'
)
systemd_networkd_extract_sources = files(
systemd_networkd_export_sources = files(
'netdev/bareudp.c',
'netdev/batadv.c',
'netdev/bond.c',
@@ -161,7 +161,7 @@ netdev_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += [networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c]
systemd_networkd_extract_sources += [networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c]
systemd_networkd_export_sources += [networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c]
if get_option('link-networkd-shared')
networkd_link_with = [libshared]
@@ -178,7 +178,7 @@ network_test_template = test_template + {
networkd_link_with,
libsystemd_network,
],
'objects' : ['systemd-networkd'],
'import' : ['systemd-networkd'],
'include_directories' : network_includes,
}
@@ -188,7 +188,7 @@ network_fuzz_template = fuzz_template + {
networkd_link_with,
libsystemd_network,
],
'objects' : ['systemd-networkd'],
'import' : ['systemd-networkd'],
'include_directories' : network_includes,
}
@@ -198,7 +198,7 @@ executables += [
'dbus' : true,
'conditions' : ['ENABLE_NETWORKD'],
'sources' : systemd_networkd_sources,
'extract' : systemd_networkd_extract_sources,
'export' : systemd_networkd_export_sources,
'include_directories' : network_includes,
'link_with' : [
libsystemd_network,
@@ -235,12 +235,12 @@ executables += [
libexec_template + {
'name' : 'systemd-network-generator',
'sources' : files('generator/network-generator-main.c'),
'extract' : files('generator/network-generator.c'),
'export' : files('generator/network-generator.c'),
'link_with' : networkd_link_with,
},
test_template + {
'sources' : files('generator/test-network-generator.c'),
'objects' : ['systemd-network-generator'],
'import' : ['systemd-network-generator'],
'suite' : 'network',
},
network_test_template + {
src/nspawn/meson.build
+4 -4
View File
@@ -13,7 +13,7 @@ nspawn_sources = files(
'nspawn-setuid.c',
'nspawn-stub-pid1.c',
)
nspawn_extract_sources = files(
nspawn_export_sources = files(
'nspawn-expose-ports.c',
'nspawn-mount.c',
'nspawn-network.c',
@@ -27,11 +27,11 @@ nspawn_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += nspawn_gperf_c
nspawn_extract_sources += nspawn_gperf_c
nspawn_export_sources += nspawn_gperf_c
nspawn_common_template = {
'dependencies' : libseccomp_cflags,
'objects' : ['systemd-nspawn'],
'import' : ['systemd-nspawn'],
}
nspawn_test_template = test_template + nspawn_common_template
nspawn_fuzz_template = fuzz_template + nspawn_common_template
@@ -41,7 +41,7 @@ executables += [
'name' : 'systemd-nspawn',
'public' : true,
'sources' : nspawn_sources,
'extract' : nspawn_extract_sources,
'export' : nspawn_export_sources,
'include_directories' : [
include_directories('.'),
executable_template['include_directories'],
src/nsresourced/meson.build
+4 -4
View File
@@ -8,7 +8,7 @@ systemd_nsresourced_sources = files(
'nsresourced-manager.c',
'nsresourced.c',
)
systemd_nsresourced_extract_sources = files(
systemd_nsresourced_export_sources = files(
'userns-restrict.c',
'userns-registry.c',
)
@@ -23,7 +23,7 @@ executables += [
libexec_template + {
'name' : 'systemd-nsresourced',
'sources' : systemd_nsresourced_sources,
'extract' : systemd_nsresourced_extract_sources,
'export' : systemd_nsresourced_export_sources,
'dependencies' : [
libbpf_cflags,
],
@@ -32,13 +32,13 @@ executables += [
libexec_template + {
'name' : 'systemd-nsresourcework',
'sources' : systemd_nsresourcework_sources,
'objects' : ['systemd-nsresourced'],
'import' : ['systemd-nsresourced'],
'bpf_programs': ['userns-restrict'],
},
test_template + {
'sources' : test_userns_restrict_sources,
'conditions' : ['HAVE_VMLINUX_H'],
'objects' : ['systemd-nsresourced'],
'import' : ['systemd-nsresourced'],
'bpf_programs': ['userns-restrict'],
},
]
src/oom/meson.build
+3 -3
View File
@@ -10,7 +10,7 @@ systemd_oomd_sources = files(
'oomd-manager.c',
'oomd-manager-bus.c',
)
systemd_oomd_extract_sources = files(
systemd_oomd_export_sources = files(
'oomd-util.c',
)
@@ -19,7 +19,7 @@ executables += [
'name' : 'systemd-oomd',
'dbus' : true,
'sources' : systemd_oomd_sources,
'extract' : systemd_oomd_extract_sources,
'export' : systemd_oomd_export_sources,
'dependencies' : libatomic,
},
executable_template + {
@@ -29,7 +29,7 @@ executables += [
},
test_template + {
'sources' : files('test-oomd-util.c'),
'objects' : ['systemd-oomd'],
'import' : ['systemd-oomd'],
'dependencies' : libatomic,
},
]
src/repart/meson.build
+2 -2
View File
@@ -8,7 +8,7 @@ executables += [
executable_template + {
'name' : 'systemd-repart',
'public' : true,
'extract' : files(
'export' : files(
'iso9660.c',
'repart.c',
'repart-list-candidate-devices.c',
@@ -25,7 +25,7 @@ executables += [
executable_template + {
'name' : 'systemd-repart.standalone',
'public' : true,
'objects' : ['systemd-repart'],
'import' : ['systemd-repart'],
'link_with' : [
libc_wrapper_static,
libbasic_static,
src/report/meson.build
+38 -18
View File
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
executables += [
libexec_template + {
report_executables = [
{
'name' : 'systemd-report',
'public' : true,
'sources' : files(
'export' : files(
'report.c',
'report-generate.c',
'report-sign.c',
@@ -14,43 +14,63 @@ executables += [
libcurl_cflags,
],
},
libexec_template + {
{
'name' : 'systemd-report-basic',
'public' : true,
'sources' : files(
'report-basic-server.c',
'export' : files(
'report-basic.c',
'report-basic-server.c',
),
},
libexec_template + {
{
'name' : 'systemd-report-cgroup',
'sources' : files(
'export' : files(
'report-cgroup.c',
'report-cgroup-server.c',
),
},
libexec_template + {
{
'name' : 'systemd-report-files',
'sources' : files(
'export' : files(
'report-files.c',
'report-files-server.c',
),
},
libexec_template + {
{
'name' : 'systemd-report-sign-plain',
'conditions' : [
'HAVE_OPENSSL',
],
'sources' : files(
'export' : files(
'report-sign-plain.c',
),
'dependencies' : libopenssl_cflags,
'conditions' : ['HAVE_OPENSSL'],
},
libexec_template + {
{
'name' : 'systemd-report-sign-tsm',
'sources' : files(
'export' : files(
'report-sign-tsm.c',
),
},
]
foreach exe : report_executables
exe2 = {
'name' : exe['name'] + '.standalone',
'import' : [exe['name']],
'link_with' : [
libc_wrapper_static,
libbasic_static,
libshared_static,
libsystemd_static,
]
}
foreach optional : ['public', 'dependencies', 'conditions']
if optional in exe
exe2 += { optional : exe[optional] }
endif
endforeach
executables += [
libexec_template + exe,
libexec_template + exe2,
]
endforeach
src/resolve/meson.build
+7 -7
View File
@@ -7,7 +7,7 @@ endif
systemd_resolved_sources = files(
'resolved.c',
)
systemd_resolved_extract_sources = files(
systemd_resolved_export_sources = files(
'resolved-bus.c',
'resolved-conf.c',
'resolved-dns-browse-services.c',
@@ -59,10 +59,10 @@ resolved_dns_delegate_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += [resolved_gperf_c, resolved_dnssd_gperf_c, resolved_dns_delegate_gperf_c]
systemd_resolved_extract_sources += [resolved_gperf_c, resolved_dnssd_gperf_c, resolved_dns_delegate_gperf_c]
systemd_resolved_export_sources += [resolved_gperf_c, resolved_dnssd_gperf_c, resolved_dns_delegate_gperf_c]
if conf.get('ENABLE_DNS_OVER_TLS') == 1
systemd_resolved_extract_sources += files(
systemd_resolved_export_sources += files(
'resolved-dnstls.c',
)
endif
@@ -74,15 +74,15 @@ resolve_common_template = {
],
}
resolve_test_template = test_template + resolve_common_template + {'objects' : ['systemd-resolved']}
resolve_fuzz_template = fuzz_template + resolve_common_template + {'objects' : ['systemd-resolved']}
resolve_test_template = test_template + resolve_common_template + {'import' : ['systemd-resolved']}
resolve_fuzz_template = fuzz_template + resolve_common_template + {'import' : ['systemd-resolved']}
executables += [
libexec_template + resolve_common_template + {
'name' : 'systemd-resolved',
'dbus' : true,
'sources' : systemd_resolved_sources,
'extract' : systemd_resolved_extract_sources,
'export' : systemd_resolved_export_sources,
},
executable_template + resolve_common_template + {
'name' : 'resolvectl',
@@ -91,7 +91,7 @@ executables += [
'resolvconf-compat.c',
'resolvectl.c',
),
'objects' : ['systemd-resolved'],
'import' : ['systemd-resolved'],
},
resolve_test_template + {
'sources' : files('test-resolve-tables.c'),
src/shutdown/meson.build
+2 -2
View File
@@ -12,7 +12,7 @@ shutdown_detach_sources = files(
executables += [
libexec_template + {
'name' : 'systemd-shutdown',
'extract' : files(
'export' : files(
'detach-dm.c',
'detach-loopback.c',
'detach-md.c',
@@ -22,7 +22,7 @@ executables += [
},
libexec_template + {
'name' : 'systemd-shutdown.standalone',
'objects' : ['systemd-shutdown'],
'import' : ['systemd-shutdown'],
'link_with' : [
libc_wrapper_static,
libbasic_static,
src/sleep/meson.build
+2 -2
View File
@@ -4,11 +4,11 @@ executables += [
libexec_template + {
'name' : 'systemd-sleep',
'sources' : files('sleep.c'),
'extract' : files('battery-capacity.c'),
'export' : files('battery-capacity.c'),
},
test_template + {
'sources' : files('test-battery-capacity.c'),
'objects' : ['systemd-sleep'],
'import' : ['systemd-sleep'],
},
]
src/ssh-generator/meson.build
+2 -2
View File
@@ -4,7 +4,7 @@ executables += [
generator_template + {
'name' : 'systemd-ssh-generator',
'sources' : files('ssh-generator.c'),
'extract' : files('ssh-util.c'),
'export' : files('ssh-util.c'),
},
libexec_template + {
'name' : 'systemd-ssh-proxy',
@@ -13,7 +13,7 @@ executables += [
libexec_template + {
'name' : 'systemd-ssh-issue',
'sources' : files('ssh-issue.c'),
'objects' : ['systemd-ssh-generator'],
'import' : ['systemd-ssh-generator'],
},
]
src/systemctl/meson.build
+3 -3
View File
@@ -30,7 +30,7 @@ systemctl_sources = files(
'systemctl-trivial-method.c',
'systemctl-whoami.c',
)
systemctl_extract_sources = files(
systemctl_export_sources = files(
'systemctl-compat-halt.c',
'systemctl-compat-shutdown.c',
'systemctl-daemon-reload.c',
@@ -52,7 +52,7 @@ executables += [
'name' : 'systemctl',
'public' : true,
'sources' : systemctl_sources,
'extract' : systemctl_extract_sources,
'export' : systemctl_export_sources,
'link_with' : systemctl_link_with,
'dependencies' : [
liblz4_cflags,
@@ -63,7 +63,7 @@ executables += [
},
fuzz_template + {
'sources' : files('fuzz-systemctl-parse-argv.c'),
'objects' : ['systemctl'],
'import' : ['systemctl'],
'link_with' : systemctl_link_with,
'dependencies' : [
libselinux_cflags,
src/sysupdate/meson.build
+4 -4
View File
@@ -14,7 +14,7 @@ systemd_sysupdate_sources = files(
'sysupdate-update-set.c',
'sysupdate.c',
)
systemd_sysupdate_extract_sources = files(
systemd_sysupdate_export_sources = files(
'sysupdate-update-set-flags.c',
'sysupdate-util.c',
)
@@ -29,7 +29,7 @@ executables += [
'public' : true,
'conditions' : ['ENABLE_SYSUPDATE'],
'sources' : systemd_sysupdate_sources,
'extract' : systemd_sysupdate_extract_sources,
'export' : systemd_sysupdate_export_sources,
'dependencies' : [
libfdisk_cflags,
libopenssl_cflags,
@@ -45,12 +45,12 @@ executables += [
'name' : 'updatectl',
'public' : true,
'sources' : systemd_updatectl_sources,
'objects' : ['systemd-sysupdate'],
'import' : ['systemd-sysupdate'],
'conditions' : ['ENABLE_SYSUPDATED'],
},
test_template + {
'sources' : files('test-sysupdate-util.c'),
'objects' : ['systemd-sysupdate'],
'import' : ['systemd-sysupdate'],
'conditions' : ['ENABLE_SYSUPDATE'],
},
]
src/sysusers/meson.build
+2 -2
View File
@@ -8,13 +8,13 @@ executables += [
executable_template + {
'name' : 'systemd-sysusers',
'public' : true,
'extract' : files('sysusers.c'),
'export' : files('sysusers.c'),
'dependencies' : libaudit_cflags,
},
executable_template + {
'name' : 'systemd-sysusers.standalone',
'public' : true,
'objects' : ['systemd-sysusers'],
'import' : ['systemd-sysusers'],
'link_with' : [
libc_wrapper_static,
libbasic_static,
src/test/meson.build
+5 -5
View File
@@ -438,14 +438,14 @@ executables += [
},
test_template + {
'sources' : files('test-nss-hosts.c'),
'extract' : files('nss-test-util.c'),
'export' : files('nss-test-util.c'),
'dependencies' : libseccomp_cflags,
'conditions' : ['ENABLE_NSS'],
'timeout' : 120,
},
test_template + {
'sources' : files('test-nss-users.c'),
'objects' : ['test-nss-hosts'],
'import' : ['test-nss-hosts'],
'conditions' : ['ENABLE_NSS'],
},
test_template + {
@@ -463,7 +463,7 @@ executables += [
},
test_template + {
'sources' : files('test-qmp-client-qemu.c'),
'objects' : ['systemd-vmspawn'],
'import' : ['systemd-vmspawn'],
'conditions' : ['ENABLE_VMSPAWN'],
},
test_template + {
@@ -517,12 +517,12 @@ executables += [
},
test_template + {
'sources' : files('test-varlink-idl-machine.c'),
'objects' : ['systemd-machined'],
'import' : ['systemd-machined'],
'conditions' : ['ENABLE_MACHINED'],
},
test_template + {
'sources' : files('test-varlink-idl-login.c'),
'objects' : ['systemd-logind'],
'import' : ['systemd-logind'],
'conditions' : ['ENABLE_LOGIND'],
},
test_template + {
src/timesync/meson.build
+5 -5
View File
@@ -8,7 +8,7 @@ timesyncd_sources = files(
'timesyncd.c',
'timesyncd-bus.c',
)
timesyncd_extract_sources = files(
timesyncd_export_sources = files(
'timesyncd-conf.c',
'timesyncd-manager.c',
'timesyncd-server.c',
@@ -20,7 +20,7 @@ timesyncd_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += timesyncd_gperf_c
timesyncd_extract_sources += timesyncd_gperf_c
timesyncd_export_sources += timesyncd_gperf_c
if get_option('link-timesyncd-shared')
timesyncd_link_with = [libshared]
@@ -33,19 +33,19 @@ executables += [
libexec_template + {
'name' : 'systemd-timesyncd',
'sources' : timesyncd_sources,
'extract' : timesyncd_extract_sources,
'export' : timesyncd_export_sources,
'link_with' : timesyncd_link_with,
'dependencies' : libm,
},
libexec_template + {
'name' : 'systemd-time-wait-sync',
'sources' : files('wait-sync.c'),
'objects' : ['systemd-timesyncd'],
'import' : ['systemd-timesyncd'],
'dependencies' : libm,
},
test_template + {
'sources' : files('test-timesync.c'),
'objects' : ['systemd-timesyncd'],
'import' : ['systemd-timesyncd'],
'dependencies' : libm,
},
]
src/tmpfiles/meson.build
+2 -2
View File
@@ -10,7 +10,7 @@ executables += [
executable_template + {
'name' : 'systemd-tmpfiles',
'public' : true,
'extract' : files('tmpfiles.c') +
'export' : files('tmpfiles.c') +
offline_passwd_c,
'dependencies' : [
libacl_cflags,
@@ -20,7 +20,7 @@ executables += [
executable_template + {
'name' : 'systemd-tmpfiles.standalone',
'public' : true,
'objects' : ['systemd-tmpfiles'],
'import' : ['systemd-tmpfiles'],
'link_with' : [
libc_wrapper_static,
libbasic_static,
src/udev/meson.build
+11 -11
View File
@@ -17,7 +17,7 @@ udevadm_sources = files(
'udevadm.c',
'udevd.c',
)
udevadm_extract_sources = files(
udevadm_export_sources = files(
'net/link-config.c',
'udev-builtin.c',
'udev-builtin-btrfs.c',
@@ -48,19 +48,19 @@ udevadm_extract_sources = files(
)
if conf.get('HAVE_KMOD') == 1
udevadm_extract_sources += files('udev-builtin-kmod.c')
udevadm_export_sources += files('udev-builtin-kmod.c')
endif
if conf.get('HAVE_BLKID') == 1
udevadm_extract_sources += files('udev-builtin-blkid.c')
udevadm_export_sources += files('udev-builtin-blkid.c')
endif
if conf.get('HAVE_ACL') == 1
udevadm_extract_sources += files('udev-builtin-uaccess.c')
udevadm_export_sources += files('udev-builtin-uaccess.c')
endif
if conf.get('HAVE_TPM2') == 1
udevadm_extract_sources += files('udev-builtin-tpm2_id.c')
udevadm_export_sources += files('udev-builtin-tpm2_id.c')
endif
############################################################
@@ -101,7 +101,7 @@ link_config_gperf_c = custom_target(
output : 'link-config-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
udevadm_extract_sources += link_config_gperf_c
udevadm_export_sources += link_config_gperf_c
generated_sources += link_config_gperf_c
############################################################
@@ -135,7 +135,7 @@ udev_plugin_template = executable_template + {
}
udev_common_template = {
'objects' : ['udevadm'],
'import' : ['udevadm'],
'dependencies' : [
libacl_cflags,
libblkid_cflags,
@@ -150,7 +150,7 @@ udev_binaries_dict = [
'public' : true,
'sources' : udevadm_sources +
keyboard_keys_from_name_inc,
'extract' : udevadm_extract_sources,
'export' : udevadm_export_sources,
'include_directories' : [
include_directories('.', 'net'),
libexec_template['include_directories'],
@@ -176,7 +176,7 @@ udev_binaries_dict = [
udev_plugin_template + {
'name' : 'fido_id',
'sources' : files('fido_id/fido_id.c'),
'extract' : files('fido_id/fido_id_desc.c'),
'export' : files('fido_id/fido_id_desc.c'),
},
udev_plugin_template + {
'name' : 'iocost',
@@ -211,7 +211,7 @@ executables += udev_binaries_dict
executables += [
test_template + {
'sources' : files('fido_id/test-fido-id-desc.c'),
'objects' : ['fido_id'],
'import' : ['fido_id'],
'suite' : 'udev',
},
udev_test_template + {
@@ -245,7 +245,7 @@ executables += [
},
fuzz_template + {
'sources' : files('fido_id/fuzz-fido-id-desc.c'),
'objects' : ['fido_id'],
'import' : ['fido_id'],
},
udev_fuzz_template + {
'sources' : files('net/fuzz-link-parser.c'),
src/vmspawn/meson.build
+4 -4
View File
@@ -13,7 +13,7 @@ vmspawn_sources = files(
'vmspawn-scope.c',
'vmspawn-mount.c',
)
vmspawn_extract_sources = files(
vmspawn_export_sources = files(
'vmspawn-util.c',
'vmspawn-qemu-config.c',
)
@@ -23,14 +23,14 @@ executables += [
'name' : 'systemd-vmspawn',
'public' : true,
'sources' : vmspawn_sources,
'extract' : vmspawn_extract_sources,
'export' : vmspawn_export_sources,
},
test_template + {
'sources' : files('test-vmspawn-util.c'),
'objects' : ['systemd-vmspawn'],
'import' : ['systemd-vmspawn'],
},
test_template + {
'sources' : files('test-vmspawn-qemu-config.c'),
'objects' : ['systemd-vmspawn'],
'import' : ['systemd-vmspawn'],
},
]
src/xdg-autostart-generator/meson.build
+3 -3
View File
@@ -8,7 +8,7 @@ executables += [
executable_template + {
'name' : 'systemd-xdg-autostart-generator',
'sources' : files('xdg-autostart-generator.c'),
'extract' : files('xdg-autostart-service.c'),
'export' : files('xdg-autostart-service.c'),
'install_dir' : usergeneratordir,
},
libexec_template + {
@@ -17,10 +17,10 @@ executables += [
},
test_template + {
'sources' : files('test-xdg-autostart.c'),
'objects' : ['systemd-xdg-autostart-generator'],
'import' : ['systemd-xdg-autostart-generator'],
},
fuzz_template + {
'sources' : files('fuzz-xdg-desktop.c'),
'objects' : ['systemd-xdg-autostart-generator'],
'import' : ['systemd-xdg-autostart-generator'],
},
]
test/meson.build
+2 -2
View File
@@ -98,7 +98,7 @@ endif
############################################################
test_compare_versions_sh = files('test-compare-versions.sh')
if want_tests != 'false' and executables_by_name.has_key('systemd-analyze')
if want_tests != 'false' and 'systemd-analyze' in executables_by_name
exe = executables_by_name.get('systemd-analyze')
test('test-compare-versions',
test_compare_versions_sh,
@@ -156,7 +156,7 @@ endif
############################################################
test_fstab_generator_sh = files('test-fstab-generator.sh')
if want_tests != 'false' and executables_by_name.has_key('systemd-fstab-generator')
if want_tests != 'false' and 'systemd-fstab-generator' in executables_by_name
exe = executables_by_name.get('systemd-fstab-generator')
test('test-fstab-generator',
test_fstab_generator_sh,