External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: src: install libvirt daemon conf and augeas files

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-07-27 08:52:17 +02:00
parent da4c7f8687
commit 6e07b2ba49
16 changed files with 64 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -70,8 +70,6 @@ include storage/Makefile.inc.am
include remote/Makefile.inc.am
conf_DATA += libvirt.conf
BUILT_SOURCES += $(nodist_conf_DATA)
# .libs/libvirt.so is built by libtool as a side-effect of the Makefile

2
src/admin/Makefile.inc.am
View File

@ -2,8 +2,6 @@
ADMIN_SYM_FILES = $(srcdir)/admin/libvirt_admin_private.syms
conf_DATA += admin/libvirt-admin.conf
if WITH_LINUX
check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la
$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \

2
src/admin/meson.build
View File

@ -95,6 +95,8 @@ admin_driver_lib = static_library(
],
)
virt_conf_files += files('libvirt-admin.conf')
admin_inc_dir = include_directories('.')
admin_dep = declare_dependency(

2
src/bhyve/Makefile.inc.am
View File

@ -31,8 +31,6 @@ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
> $@ || rm -f $@
conf_DATA += bhyve/bhyve.conf
augeas_DATA += bhyve/libvirtd_bhyve.aug
augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \

3
src/bhyve/meson.build
View File

@ -43,4 +43,7 @@ if conf.has('WITH_BHYVE')
'-DMODULE_NAME="bhyve"'
],
}
virt_conf_files += files('bhyve.conf')
virt_aug_files += files('libvirtd_bhyve.aug')
endif

2
src/libxl/Makefile.inc.am
View File

@ -71,8 +71,6 @@ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
> $@ || rm -f $@
conf_DATA += libxl/libxl.conf
augeas_DATA += libxl/libvirtd_libxl.aug
augeastest_DATA += libxl/test_libvirtd_libxl.aug
libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \

3
src/libxl/meson.build
View File

@ -44,4 +44,7 @@ if conf.has('WITH_LIBXL')
'-DMODULE_NAME="libxl"',
],
}
virt_conf_files += files('libxl.conf')
virt_aug_files += files('libvirtd_libxl.aug')
endif

27
src/locking/Makefile.inc.am
View File

@ -20,34 +20,15 @@ OPENRC_INIT_FILES_IN += \
$(NULL)
if WITH_LIBVIRTD
augeas_DATA += locking/libvirt_lockd.aug
if WITH_QEMU
augeastest_DATA += locking/test_libvirt_lockd.aug
nodist_conf_DATA += locking/qemu-lockd.conf
endif WITH_QEMU
if WITH_LIBXL
nodist_conf_DATA += locking/libxl-lockd.conf
endif WITH_LIBXL
if WITH_SANLOCK
augeas_DATA += locking/libvirt_sanlock.aug
if WITH_QEMU
augeastest_DATA += locking/test_libvirt_sanlock.aug
nodist_conf_DATA += locking/qemu-sanlock.conf
endif WITH_QEMU
if WITH_LIBXL
nodist_conf_DATA += locking/libxl-sanlock.conf
endif WITH_LIBXL
endif WITH_SANLOCK
conf_DATA += locking/virtlockd.conf
augeas_DATA += locking/virtlockd.aug
augeastest_DATA += locking/test_virtlockd.aug
INSTALL_DATA_DIRS += locking
@ -94,14 +75,6 @@ endif WITH_LIBVIRTD
uninstall-data-locking \
$(NULL)
locking/%-lockd.conf: $(srcdir)/locking/lockd.conf
$(AM_V_GEN)$(MKDIR_P) locking ; \
cp $< $@
locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
$(AM_V_GEN)$(MKDIR_P) locking ; \
cp $< $@
virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@

45
src/locking/meson.build
View File

@ -145,4 +145,49 @@ if conf.has('WITH_LIBVIRTD')
],
}
endif
virt_aug_files += files('libvirt_lockd.aug')
if conf.has('WITH_QEMU')
qemu_lockd_conf = configure_file(
input: 'lockd.conf',
output: 'qemu-lockd.conf',
copy: true,
)
virt_conf_files += qemu_lockd_conf
endif
if conf.has('WITH_LIBXL')
libxl_lockd_conf = configure_file(
input: 'lockd.conf',
output: 'libxl-lockd.conf',
copy: true,
)
virt_conf_files += libxl_lockd_conf
endif
if conf.has('WITH_SANLOCK')
virt_aug_files += files('libvirt_sanlock.aug')
if conf.has('WITH_QEMU')
qemu_sanlock_conf = configure_file(
input: 'sanlock.conf',
output: 'qemu-sanlock.conf',
copy: true,
)
virt_conf_files += qemu_sanlock_conf
endif
if conf.has('WITH_LIBXL')
libxl_sanlock_conf = configure_file(
input: 'sanlock.conf',
output: 'libxl-sanlock.conf',
copy: true,
)
virt_conf_files += libxl_sanlock_conf
endif
endif
virt_conf_files += files('virtlockd.conf')
virt_aug_files += files('virtlockd.aug')
endif

3
src/logging/Makefile.inc.am
View File

@ -19,9 +19,6 @@ OPENRC_INIT_FILES_IN += \
$(NULL)
if WITH_LIBVIRTD
conf_DATA += logging/virtlogd.conf
augeas_DATA += logging/virtlogd.aug
augeastest_DATA += logging/test_virtlogd.aug
logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \

3
src/logging/meson.build
View File

@ -70,6 +70,9 @@ if conf.has('WITH_LIBVIRTD')
include_directories('.'),
],
}
virt_conf_files += files('virtlogd.conf')
virt_aug_files += files('virtlogd.aug')
endif
log_inc_dir = include_directories('.')

3
src/lxc/Makefile.inc.am
View File

@ -77,9 +77,6 @@ if WITH_DTRACE_PROBES
RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
endif
conf_DATA += lxc/lxc.conf
augeas_DATA += lxc/libvirtd_lxc.aug
augeastest_DATA += lxc/test_libvirtd_lxc.aug
lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \

3
src/lxc/meson.build
View File

@ -128,4 +128,7 @@ if conf.has('WITH_LXC')
xdr_dep,
],
}
virt_conf_files += files('lxc.conf')
virt_aug_files += files('libvirtd_lxc.aug')
endif

2
src/meson.build
View File

@ -595,6 +595,8 @@ endforeach
# Generate daemon config, augeas and augeas test files
virt_conf_files += 'libvirt.conf'
install_data(virt_conf_files, install_dir: confdir)
install_data(virt_aug_files, install_dir: virt_aug_dir)

3
src/qemu/Makefile.inc.am
View File

@ -66,9 +66,6 @@ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
> $@ || rm -f $@
conf_DATA += qemu/qemu.conf
augeas_DATA += qemu/libvirtd_qemu.aug
augeastest_DATA += qemu/test_libvirtd_qemu.aug
qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \

3
src/qemu/meson.build
View File

@ -122,6 +122,9 @@ if conf.has('WITH_QEMU')
],
}
virt_conf_files += files('qemu.conf')
virt_aug_files += files('libvirtd_qemu.aug')
virt_helpers += {
'name': 'virt-qemu-run',
'sources': [