proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 04:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: Fix internal binaries

Browse Source 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Stéphane Graber 2022-05-01 10:21:33 +02:00
parent 46b9598f1a
commit 2f1bf5f58b
No known key found for this signature in database
GPG Key ID: C638974D64792D67
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -70,6 +70,7 @@ lxcdefaultconfig = join_paths(sysconfdir, 'lxc/default.conf')
lxcglobalconfig = join_paths(sysconfdir, globalconfig) lxcglobalconfig = join_paths(sysconfdir, globalconfig)
lxcapparmorcachedir = join_paths(localstatedir, apparmorcachedir) lxcapparmorcachedir = join_paths(localstatedir, apparmorcachedir)
lxcrootfsmount = join_paths(prefixdir, rootfsmount) lxcrootfsmount = join_paths(prefixdir, rootfsmount)
lxclibexec = join_paths(libexecdir, 'lxc')
lxclogpath = join_paths(localstatedir, logpath) lxclogpath = join_paths(localstatedir, logpath)
lxcpath = join_paths(localstatedir, lxcpathprefix) lxcpath = join_paths(localstatedir, lxcpathprefix)
lxctemplateconfig = join_paths(datadir, 'lxc/config') lxctemplateconfig = join_paths(datadir, 'lxc/config')

10
src/lxc/cmd/meson.build
View File

@ -176,13 +176,15 @@ cmd_programs += executable(
link_args: ['-static'], link_args: ['-static'],
c_args: ['-DNO_LXC_CONF'], c_args: ['-DNO_LXC_CONF'],
dependencies: [libcap_static], dependencies: [libcap_static],
install_dir: sbindir,
install: true) install: true)
cmd_programs += executable( cmd_programs += executable(
'lxc-init', 'init.lxc',
cmd_lxc_init_sources, cmd_lxc_init_sources,
include_directories: cmd_liblxc_includes, include_directories: cmd_liblxc_includes,
dependencies: liblxc_dep, dependencies: liblxc_dep,
install_dir: sbindir,
install: true) install: true)
cmd_programs += executable( cmd_programs += executable(
@ -190,14 +192,16 @@ cmd_programs += executable(
cmd_lxc_monitord_sources, cmd_lxc_monitord_sources,
include_directories: cmd_liblxc_includes, include_directories: cmd_liblxc_includes,
dependencies: liblxc_dep, dependencies: liblxc_dep,
install: true) install: true,
install_dir: lxclibexec)
cmd_programs += executable( cmd_programs += executable(
'lxc-user-nic', 'lxc-user-nic',
cmd_lxc_user_nic_sources, cmd_lxc_user_nic_sources,
include_directories: cmd_liblxc_includes, include_directories: cmd_liblxc_includes,
dependencies: liblxc_dep, dependencies: liblxc_dep,
install: true) install: true,
install_dir: lxclibexec)
cmd_programs += executable( cmd_programs += executable(
'lxc-usernsexec', 'lxc-usernsexec',