meson: src: install libvirt daemon conf and augeas files

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 4f0b3cf8684bdb97b4d9eea87b66ecd6eb3c8a89..ed158bc3c41f425adc21e9469e1a1baca465c7e9 100644 (file)
--- 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 bdaed14cd19e5e143d0748c01f2be46a82ccee2b..ec084299b85b2917c5676228f9cc5dd003668ffe 100644 (file)
--- 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 ab6912d410339f324a18b2a97ba3ed1b9e04edae..22ff27f401b70793c367add8777c23d5cb126cd6 100644 (file)
--- 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 ab681685b2bf526a6e5447f291dc1e1f74032bdb..9583580ab0290a47f0154c5d9796e8131e410da9 100644 (file)
--- 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 5807d67591adfffd77f405b76fed7c72b68e79dc..9380ec3313f280d9c30dc64a41896b78d0d7e329 100644 (file)
--- 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 051b6c55bd9f064fa5f8b8acb10d39d13e915dba..021bf4b8d5196721466bb083dd5354acca8ed8d9 100644 (file)
--- 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 fc5864a090c525b2ec23034630430c71138404e3..0415a0c4a71b91630c7042c7b0e7ce209a3919be 100644 (file)
--- 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 b4fb9387a177d010026b42a9b68f5748dbcd97cc..0826472cfcac6c29046dab0d42cfa218e98d3501 100644 (file)
--- 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 0e48c86afc973849273dc5c5f8a41b103455bbd1..9e09c96f67b8a40b6a04f6bf29bbad165c76d06a 100644 (file)
--- 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 8adec645d363f4cd04bca2a7faba43b37535b9f8..1ae0078e43499bf892307f26f8b3bf5bf13aa2e7 100644 (file)
--- 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 328a0422a9e017c8a062415fe97012234b647f12..7560488ae0fc919152299f22c184e6782aa69a49 100644 (file)
--- 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 03f03ba13db50957414364d09c42ca53b91ec05a..aea70f37a87910b076f74cd7ee7f21b74c3618a2 100644 (file)
--- 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 cf1f976573a6307e2302b3ceb27a2e394b87ba1b..7295510c62b35b5fd2fe89e33586a600fae42c81 100644 (file)
--- 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 781a228da3714911894cf491c4e5796513957e1f..404b35e8a12b6020d736692e45487c43c8c5de01 100644 (file)
--- 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 80555d79a409ee1cb277826f2515138664a3705b..5817e1266f3cc603f2384f61d4dd43980143885e 100644 (file)
--- 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 e18274f0c03ec0af2315ddc808f71365d9938af2..cbaa5f7a72b00834b0405743df6d27e353aaaf28 100644 (file)
--- 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': [