Skip to content

Commit

Permalink
Merge pull request #4108 from stgraber/master
Browse files Browse the repository at this point in the history
Meson improvements
  • Loading branch information
Christian Brauner committed Apr 29, 2022
2 parents 5a7b9ce + 14746ee commit 0c0f740
Show file tree
Hide file tree
Showing 10 changed files with 1,565 additions and 1,574 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Expand Up @@ -9,4 +9,4 @@ Mail patches to : lxc-devel@lists.linuxcontainers.org
Send pull requests at : https://github.com/lxc/lxc
Mailing lists : lxc-devel@lists.linuxcontainers.org, lxc-users@lists.linuxcontainers.org
Web page : https://linuxcontainers.org/lxc
GIT location : git://github.com/lxc/lxc
Git location : https://github.com/lxc/lxc
70 changes: 35 additions & 35 deletions hooks/meson.build
@@ -1,60 +1,60 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

hooks_include_directories = include_directories(
'../',
'../src/include')
'../',
'../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)
'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)
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)
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_quoted('LXCHOOKDIR', lxchookdir)
dhclient_config_data.set_quoted('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)
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)
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)
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)
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)
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)

0 comments on commit 0c0f740

Please sign in to comment.