From 6e07b2ba49c326781ca3ac0162aadcde5a47f756 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 08:52:17 +0200 Subject: [PATCH] meson: src: install libvirt daemon conf and augeas files Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/Makefile.am | 2 -- src/admin/Makefile.inc.am | 2 -- src/admin/meson.build | 2 ++ src/bhyve/Makefile.inc.am | 2 -- src/bhyve/meson.build | 3 +++ src/libxl/Makefile.inc.am | 2 -- src/libxl/meson.build | 3 +++ src/locking/Makefile.inc.am | 27 ---------------------- src/locking/meson.build | 45 +++++++++++++++++++++++++++++++++++++ src/logging/Makefile.inc.am | 3 --- src/logging/meson.build | 3 +++ src/lxc/Makefile.inc.am | 3 --- src/lxc/meson.build | 3 +++ src/meson.build | 2 ++ src/qemu/Makefile.inc.am | 3 --- src/qemu/meson.build | 3 +++ 16 files changed, 64 insertions(+), 44 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4f0b3cf868..ed158bc3c4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index bdaed14cd1..ec084299b8 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -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 \ diff --git a/src/admin/meson.build b/src/admin/meson.build index ab6912d410..22ff27f401 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -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( diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index ab681685b2..9583580ab0 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -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 \ diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 5807d67591..9380ec3313 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -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 diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 051b6c55bd..021bf4b8d5 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -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 \ diff --git a/src/libxl/meson.build b/src/libxl/meson.build index fc5864a090..0415a0c4a7 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -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 diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index b4fb9387a1..0826472cfc 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -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 $@ diff --git a/src/locking/meson.build b/src/locking/meson.build index 0e48c86afc..9e09c96f67 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -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 diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 8adec645d3..1ae0078e43 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -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 \ diff --git a/src/logging/meson.build b/src/logging/meson.build index 328a0422a9..7560488ae0 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -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('.') diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 03f03ba13d..aea70f37a8 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -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 \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index cf1f976573..7295510c62 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -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 diff --git a/src/meson.build b/src/meson.build index 781a228da3..404b35e8a1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 80555d79a4..5817e1266f 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -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 \ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index e18274f0c0..cbaa5f7a72 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -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': [ -- 2.47.2