From 659611a36d5f228cf83fe24e4c6e74d111b0669d Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 27 Sep 2021 11:06:50 +0200 Subject: [PATCH] build: add hooks Signed-off-by: Christian Brauner --- hooks/dhclient-script | 0 hooks/meson.build | 60 +++++++++++++++++++++++++++++++++++++++++ meson.build | 3 +++ src/lxc/cmd/meson.build | 3 --- 4 files changed, 63 insertions(+), 3 deletions(-) mode change 100644 => 100755 hooks/dhclient-script create mode 100644 hooks/meson.build diff --git a/hooks/dhclient-script b/hooks/dhclient-script old mode 100644 new mode 100755 diff --git a/hooks/meson.build b/hooks/meson.build new file mode 100644 index 000000000..eff98ec04 --- /dev/null +++ b/hooks/meson.build @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +hooks_include_directories = include_directories( + '../', + '../src/include') + +hooks_unmount_namespace_sources = files('unmount-namespace.c') + +hook_programs += executable( + 'unmount-namespace', + hooks_unmount_namespace_sources, + include_directories : hooks_include_directories, + install : true, + install_dir : lxchookdir) + +hook_programs = configure_file( + configuration : dummy_config_data, + input : 'clonehostname', + output : 'clonehostname') +install_data(join_paths(project_build_root, 'hooks/clonehostname'), install_dir : lxchookdir) + +hook_programs = configure_file( + configuration : dummy_config_data, + input : 'dhclient-script', + output : 'dhclient-script') +install_data(join_paths(project_build_root, 'hooks/dhclient-script'), install_dir : lxchookdir) + +dhclient_config_data = configuration_data() +dhclient_config_data.set('LXCHOOKDIR', lxchookdir) +dhclient_config_data.set('SYSCONFDIR', sysconfdir) + +hook_programs = configure_file( + configuration : dhclient_config_data, + input : 'dhclient.in', + output : 'dhclient') +install_data(join_paths(project_build_root, 'hooks/dhclient'), install_dir : lxchookdir) + +hook_programs = configure_file( + configuration : dummy_config_data, + input : 'mountecryptfsroot', + output : 'mountecryptfsroot') +install_data(join_paths(project_build_root, 'hooks/mountecryptfsroot'), install_dir : lxchookdir) + +hook_programs = configure_file( + configuration : dummy_config_data, + input : 'nvidia', + output : 'nvidia') +install_data(join_paths(project_build_root, 'hooks/nvidia'), install_dir : lxchookdir) + +hook_programs = configure_file( + configuration : dummy_config_data, + input : 'squid-deb-proxy-client', + output : 'squid-deb-proxy-client') +install_data(join_paths(project_build_root, 'hooks/squid-deb-proxy-client'), install_dir : lxchookdir) + +hook_programs = configure_file( + configuration : dummy_config_data, + input : 'ubuntu-cloud-prep', + output : 'ubuntu-cloud-prep') +install_data(join_paths(project_build_root, 'hooks/ubuntu-cloud-prep'), install_dir : lxchookdir) diff --git a/meson.build b/meson.build index d6374027b..cd20072d5 100644 --- a/meson.build +++ b/meson.build @@ -396,6 +396,9 @@ liblxc_dep = declare_dependency( libselinux, libapparmor]) +dummy_config_data = configuration_data() +dummy_config_data.set_quoted('DUMMY_VARIABLE', '1') + cmd_programs = [] subdir('src/lxc/cmd') diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build index 410e4689c..221a3cacb 100644 --- a/src/lxc/cmd/meson.build +++ b/src/lxc/cmd/meson.build @@ -152,9 +152,6 @@ cmd_lxc_monitord_sources = files('lxc_monitord.c') + cmd_common_sources cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources -dummy_config_data = configuration_data() -dummy_config_data.set_quoted('DUMMY_VARIABLE', '1') - cmd_lxc_checkconfig = configure_file( configuration : dummy_config_data, input : 'lxc-checkconfig.in',