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

meson: Re-organize dir variables

Browse Source 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Stéphane Graber 2022-05-12 18:56:56 +02:00
parent e4e52844c7
commit 51f90ad973
No known key found for this signature in database
GPG Key ID: C638974D64792D67
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -74,17 +74,17 @@ lxcdefaultconfig = join_paths(lxcconfdir, 'default.conf')
lxcglobalconfig = join_paths(lxcconfdir, 'lxc.conf') lxcglobalconfig = join_paths(lxcconfdir, 'lxc.conf')
lxcexamplesdir = join_paths(docdir, 'examples') lxcexamplesdir = join_paths(docdir, 'examples')
lxchookbindir = join_paths(libexecdir, 'lxc/hooks') lxchookbindir = join_paths(libexecdir, 'lxc/hooks')
lxchookdir = join_paths(datadir, 'lxc/hooks')
lxcinclude = join_paths(includedir, 'lxc') lxcinclude = join_paths(includedir, 'lxc')
lxclibexec = join_paths(libexecdir, 'lxc') 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)
lxcrootfsmount = join_paths(libdir, rootfsmount) lxcrootfsmount = join_paths(libdir, rootfsmount)
lxctemplateconfdir = join_paths(datadir, 'lxc/config') lxcdatadir = join_paths(datadir, 'lxc')
lxctemplateconfcommondir = join_paths(datadir, 'lxc/config/common.conf.d') lxchookdir = join_paths(lxcdatadir, 'hooks')
lxcselinuxdir = join_paths(datadir, 'lxc/selinux') lxcselinuxdir = join_paths(lxcdatadir, 'selinux')
lxctemplateconfig = join_paths(datadir, 'lxc/config') lxctemplateconfdir = join_paths(lxcdatadir, 'config')
lxctemplatedir = join_paths(datadir, 'lxc/templates') lxctemplateconfcommondir = join_paths(lxctemplateconfdir, 'common.conf.d')
lxctemplatedir = join_paths(lxcdatadir, 'templates')
lxc_user_network_conf = join_paths(sysconfdir, user_network_conf_opt) lxc_user_network_conf = join_paths(sysconfdir, user_network_conf_opt)
lxc_user_network_db = join_paths(runtimepath, user_network_db_opt) lxc_user_network_db = join_paths(runtimepath, user_network_db_opt)
@ -108,7 +108,7 @@ conf.set_quoted('LXCHOOKDIR', lxchookdir)
conf.set_quoted('LXCINITDIR', libexecdir) conf.set_quoted('LXCINITDIR', libexecdir)
conf.set_quoted('LXCPATH', lxcpath) conf.set_quoted('LXCPATH', lxcpath)
conf.set_quoted('LXCROOTFSMOUNT', lxcrootfsmount) conf.set_quoted('LXCROOTFSMOUNT', lxcrootfsmount)
conf.set_quoted('LXCTEMPLATECONFIG', lxctemplateconfig) conf.set_quoted('LXCTEMPLATECONFIG', lxctemplateconfdir)
conf.set_quoted('LXCTEMPLATEDIR', lxctemplatedir) conf.set_quoted('LXCTEMPLATEDIR', lxctemplatedir)
conf.set_quoted('LXC_USERNIC_CONF', lxc_user_network_conf) conf.set_quoted('LXC_USERNIC_CONF', lxc_user_network_conf)
conf.set_quoted('LXC_USERNIC_DB', lxc_user_network_db) conf.set_quoted('LXC_USERNIC_DB', lxc_user_network_db)
@ -654,7 +654,7 @@ status = [
'lxc rootfs mount directory: @0@'.format(lxcrootfsmount), 'lxc rootfs mount directory: @0@'.format(lxcrootfsmount),
'log path: @0@'.format(lxclogpath), 'log path: @0@'.format(lxclogpath),
'lxc path: @0@'.format(lxcpath), 'lxc path: @0@'.format(lxcpath),
'lxc template config: @0@'.format(lxctemplateconfig), 'lxc template config: @0@'.format(lxctemplateconfdir),
'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 config: @0@'.format(lxc_user_network_conf),
'lxc user network database: @0@'.format(lxc_user_network_db)] 'lxc user network database: @0@'.format(lxc_user_network_db)]

2
templates/meson.build
View File

@ -9,7 +9,7 @@ template_scripts = configure_file(
template_config_data = configuration_data() template_config_data = configuration_data()
template_config_data.set_quoted('LXCHOOKDIR', lxchookdir) template_config_data.set_quoted('LXCHOOKDIR', lxchookdir)
template_config_data.set_quoted('LXCTEMPLATECONFIG', lxctemplateconfig) template_config_data.set_quoted('LXCTEMPLATECONFIG', lxctemplateconfdir)
template_config_data.set_quoted('LOCALSTATEDIR', localstatedir) template_config_data.set_quoted('LOCALSTATEDIR', localstatedir)
template_config_data.set_quoted('PACKAGE_VERSION', meson.project_version()) template_config_data.set_quoted('PACKAGE_VERSION', meson.project_version())