From c2931f74c54c7511d75f941f9111e9f221aa109a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 12 May 2022 16:16:36 +0200 Subject: [PATCH] meson: Add common configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- config/templates/common.conf.d/meson.build | 8 +++++ config/templates/meson.build | 36 ++++++++++++++++++++++ meson.build | 4 +++ 3 files changed, 48 insertions(+) create mode 100644 config/templates/common.conf.d/meson.build create mode 100644 config/templates/meson.build diff --git a/config/templates/common.conf.d/meson.build b/config/templates/common.conf.d/meson.build new file mode 100644 index 000000000..32acfc480 --- /dev/null +++ b/config/templates/common.conf.d/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +lxc_conf_common_readme = configure_file( + configuration: dummy_config_data, + input: 'README', + output: 'README', + install: true, + install_dir: lxctemplateconfcommondir) diff --git a/config/templates/meson.build b/config/templates/meson.build new file mode 100644 index 000000000..bed1cd4ea --- /dev/null +++ b/config/templates/meson.build @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +lxc_conf_common_seccomp = configure_file( + configuration: conf, + input: 'common.seccomp', + output: 'common.seccomp', + install: true, + install_dir: lxctemplateconfdir) + +lxc_conf_common_main = configure_file( + configuration: conf, + input: 'common.conf.in', + output: 'common.conf', + install: true, + install_dir: lxctemplateconfdir) + +lxc_conf_common_nesting = configure_file( + configuration: conf, + input: 'nesting.conf.in', + output: 'nesting.conf', + install: true, + install_dir: lxctemplateconfdir) + +lxc_conf_common_oci = configure_file( + configuration: conf, + input: 'oci.common.conf.in', + output: 'oci.common.conf', + install: true, + install_dir: lxctemplateconfdir) + +lxc_conf_common_userns = configure_file( + configuration: conf, + input: 'userns.conf.in', + output: 'userns.conf', + install: true, + install_dir: lxctemplateconfdir) diff --git a/meson.build b/meson.build index 1b6c74cbd..72fa60faa 100644 --- a/meson.build +++ b/meson.build @@ -80,6 +80,8 @@ lxclibexec = join_paths(libexecdir, 'lxc') lxclogpath = join_paths(localstatedir, logpath) lxcpath = join_paths(localstatedir, lxcpathprefix) lxcrootfsmount = join_paths(libdir, rootfsmount) +lxctemplateconfdir = join_paths(datadir, 'lxc/config') +lxctemplateconfcommondir = join_paths(datadir, 'lxc/config/common.conf.d') lxcselinuxdir = join_paths(datadir, 'lxc/selinux') lxctemplateconfig = join_paths(datadir, 'lxc/config') lxctemplatedir = join_paths(datadir, 'lxc/templates') @@ -598,6 +600,8 @@ liblxc_dep = declare_dependency( subdir('config/bash') subdir('config/etc') subdir('config/selinux') +subdir('config/templates') +subdir('config/templates/common.conf.d') subdir('doc/examples') subdir('doc/rootfs') subdir('hooks')