Merge pull request #17810 from systemd/meson-allows-fuzzer-building
meson: always allow fuzzers to be built
This commit is contained in:
commit
f01a3b79fa
13
meson.build
13
meson.build
|
@ -221,11 +221,11 @@ conf.set_quoted('USER_CONFIG_UNIT_DIR', join_paths(pkgsysc
|
||||||
conf.set_quoted('USER_DATA_UNIT_DIR', userunitdir)
|
conf.set_quoted('USER_DATA_UNIT_DIR', userunitdir)
|
||||||
conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root'))
|
conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root'))
|
||||||
conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database'))
|
conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database'))
|
||||||
conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent'))
|
|
||||||
conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd'))
|
conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd'))
|
||||||
|
conf.set_quoted('SYSTEMD_CGROUPS_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent'))
|
||||||
conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck'))
|
conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck'))
|
||||||
conf.set_quoted('SYSTEMD_MAKEFS_PATH', join_paths(rootlibexecdir, 'systemd-makefs'))
|
|
||||||
conf.set_quoted('SYSTEMD_GROWFS_PATH', join_paths(rootlibexecdir, 'systemd-growfs'))
|
conf.set_quoted('SYSTEMD_GROWFS_PATH', join_paths(rootlibexecdir, 'systemd-growfs'))
|
||||||
|
conf.set_quoted('SYSTEMD_MAKEFS_PATH', join_paths(rootlibexecdir, 'systemd-makefs'))
|
||||||
conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', join_paths(rootlibexecdir, 'systemd-shutdown'))
|
conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', join_paths(rootlibexecdir, 'systemd-shutdown'))
|
||||||
conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl'))
|
conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl'))
|
||||||
conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
|
conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
|
||||||
|
@ -3438,8 +3438,7 @@ endif
|
||||||
|
|
||||||
fuzzer_exes = []
|
fuzzer_exes = []
|
||||||
|
|
||||||
if fuzz_tests or fuzzer_build
|
foreach tuple : fuzzers
|
||||||
foreach tuple : fuzzers
|
|
||||||
sources = tuple[0]
|
sources = tuple[0]
|
||||||
link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
|
link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
|
||||||
dependencies = tuple[2]
|
dependencies = tuple[2]
|
||||||
|
@ -3469,9 +3468,9 @@ if fuzz_tests or fuzzer_build
|
||||||
dependencies : dependencies,
|
dependencies : dependencies,
|
||||||
c_args : defs,
|
c_args : defs,
|
||||||
link_args: link_args,
|
link_args: link_args,
|
||||||
install : false)
|
install : false,
|
||||||
endforeach
|
build_by_default : fuzz_tests or fuzzer_build)
|
||||||
endif
|
endforeach
|
||||||
|
|
||||||
run_target(
|
run_target(
|
||||||
'fuzzers',
|
'fuzzers',
|
||||||
|
|
|
@ -3052,7 +3052,7 @@ int manager_setup_cgroup(Manager *m) {
|
||||||
/* On the legacy hierarchy we only get notifications via cgroup agents. (Which isn't really reliable,
|
/* On the legacy hierarchy we only get notifications via cgroup agents. (Which isn't really reliable,
|
||||||
* since it does not generate events when control groups with children run empty. */
|
* since it does not generate events when control groups with children run empty. */
|
||||||
|
|
||||||
r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH);
|
r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUPS_AGENT_PATH);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
log_warning_errno(r, "Failed to install release agent, ignoring: %m");
|
log_warning_errno(r, "Failed to install release agent, ignoring: %m");
|
||||||
else if (r > 0)
|
else if (r > 0)
|
||||||
|
|
Loading…
Reference in a new issue