build: add cmd builds

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/meson.build b/meson.build
index cd20072d56481372a932769fbd8e4b63e70a37df..81a5c148d4afb57b403c94911516694cb7334193 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -103,8 +103,15 @@ conf.set_quoted('LXCHOOKDIR',                      lxchookdir)
 lxchookbindir = join_paths(libexecdir, 'lxc/hooks')
 conf.set_quoted('LXCBINHOOKDIR',               lxchookbindir)
 
+user_network_conf_opt = get_option('user-network-conf')
+lxc_user_network_conf = join_paths(sysconfdir, user_network_conf_opt)
+conf.set_quoted('LXC_USERNIC_CONF',            lxc_user_network_conf)
+
+user_network_db_opt = get_option('user-network-db')
+lxc_user_network_db = join_paths(runtimepath, user_network_db_opt)
+conf.set_quoted('LXC_USERNIC_DB',              lxc_user_network_db)
+
 # AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)} '+%Y-%m-%d')")
-# AS_AC_EXPAND(LXC_USERNIC_CONF, "$with_usernic_conf")
 # AS_AC_EXPAND(LXC_USERNIC_DB, "$with_usernic_db")
 # AS_AC_EXPAND(LXC_DISTRO_SYSCONF, "$distrosysconf")
 
@@ -408,23 +415,6 @@ subdir('src/lxc/tools')
 hook_programs = []
 subdir('hooks')
 
-cmd_programs += executable(
-               'lxc-init',
-               cmd_lxc_init_sources,
-               include_directories: cmd_liblxc_includes,
-               dependencies : liblxc_dep,
-               install : true)
-
-cmd_programs += executable(
-               'init.lxc.static',
-               cmd_lxc_init_sources,
-               include_directories: cmd_liblxc_includes,
-               link_with : [liblxc_static],
-               link_args : ['-static'],
-               c_args : ['-DNO_LXC_CONF'],
-               dependencies : [libcap_static],
-               install : true)
-
 found_syscalls = []
 missing_syscalls = []
 
@@ -589,7 +579,9 @@ status = [
         'log path:                     @0@'.format(lxclogpath),
         'lxc path:                     @0@'.format(lxcpath),
         'lxc template config:          @0@'.format(lxctemplateconfig),
-        'lxc template directory:       @0@'.format(lxctemplatedir)]
+        'lxc template directory:       @0@'.format(lxctemplatedir),
+        'lxc user network config:      @0@'.format(lxc_user_network_conf),
+        'lxc user network database:    @0@'.format(lxc_user_network_db)]
 
 alt_time_epoch = run_command('date', '-Is', '-u', '-d',
                              '@@0@'.format(time_epoch)).stdout().strip()

diff --git a/meson_options.txt b/meson_options.txt
index bab30ec6b29aa6f3c240422f6fca8efb569666c9..0989055df04244f721feb2e974fa5c54313d84ff 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,3 +30,9 @@ option('global-config', type : 'string', value : 'lxc/lxc.conf',
 
 option('docdir', type : 'string',
        description : 'documentation directory')
+
+option('user-network-conf', type : 'string', value : 'lxc/lxc-usernet',
+       description : 'user network interface configuration file')
+
+option('user-network-db', type : 'string', value : 'lxc/nics',
+       description : 'user network database')

diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build
index 221a3cacbda537384d47b519d3867f7ed890c6ad..d4180999896e6a220e5e7d4f493376240dd0fb41 100644 (file)
--- a/src/lxc/cmd/meson.build
+++ b/src/lxc/cmd/meson.build
@@ -6,7 +6,8 @@ cmd_liblxc_includes = include_directories(
        '../cgroups',
        '../lsm',
        '../storage',
-       '../../include')
+       '../../include',
+       '../../../')
 
 cmd_common_sources = files(
        '../af_unix.c',
@@ -148,9 +149,9 @@ cmd_lxc_init_static_sources = files(
        '../string_utils.c',
        '../string_utils.h') + include_sources
 
-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
+cmd_lxc_monitord_sources = files('lxc_monitord.c') + cmd_common_sources + netns_ifaddrs_sources
+cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources + netns_ifaddrs_sources
+cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources + netns_ifaddrs_sources
 
 cmd_lxc_checkconfig = configure_file(
                        configuration : dummy_config_data,
@@ -164,3 +165,43 @@ cmd_lxc_update_config = configure_file(
                         input : 'lxc-update-config.in',
                         output : 'lxc-update-config')
 install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-update-config'), install_dir : bindir)
+
+cmd_lxc_update_config_data = configuration_data()
+
+cmd_programs += executable(
+               'init.lxc.static',
+               cmd_lxc_init_sources,
+               include_directories: cmd_liblxc_includes,
+               link_with : [liblxc_static],
+               link_args : ['-static'],
+               c_args : ['-DNO_LXC_CONF'],
+               dependencies : [libcap_static],
+               install : true)
+
+cmd_programs += executable(
+               'lxc-init',
+               cmd_lxc_init_sources,
+               include_directories: cmd_liblxc_includes,
+               dependencies : liblxc_dep,
+               install : true)
+
+cmd_programs += executable(
+               'lxc-monitord',
+               cmd_lxc_monitord_sources,
+               include_directories: cmd_liblxc_includes,
+               dependencies : liblxc_dep,
+               install : true)
+
+cmd_programs += executable(
+               'lxc-user-nic',
+               cmd_lxc_user_nic_sources,
+               include_directories: cmd_liblxc_includes,
+               dependencies : liblxc_dep,
+               install : true)
+
+cmd_programs += executable(
+               'lxc-usernsexec',
+               cmd_lxc_usernsexec_sources,
+               include_directories: cmd_liblxc_includes,
+               dependencies : liblxc_dep,
+               install : true)