meson: Add missing virt_install_dirs

We recently started listing these in the spec file and, since we
were not creating them during the installation phase, that broke
RPM builds.

Fixes: 4b43da0bff9b78dcf1189388d4c89e524238b41d
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/ch/meson.build b/src/ch/meson.build
index a4bf0c664925af91a4fd1658b49a21bfbb3d86d4..66b77907b0dfcf921a5898e29495afa7ad5d81ca 100644 (file)
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -65,6 +65,7 @@ if conf.has('WITH_CH')
 
   virt_install_dirs += [
     localstatedir / 'lib' / 'libvirt' / 'ch',
+    localstatedir / 'log' / 'libvirt' / 'ch',
     runstatedir / 'libvirt' / 'ch',
   ]
 endif

diff --git a/src/interface/meson.build b/src/interface/meson.build
index f9f378aeb0d29343f277202f9001341ff78793bd..828f2744223fbb560ab75003360e46fd8c987fe4 100644 (file)
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -54,4 +54,8 @@ if conf.has('WITH_INTERFACE')
     'name': 'virtinterfaced',
     'in_file': files('virtinterfaced.init.in')
   }
+
+  virt_install_dirs += [
+    runstatedir / 'libvirt' / 'interface',
+  ]
 endif

diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 91696d3490904cdda3e1dd7fe2a1dc1fc6eeddea..0cc277db826759bd16d6f7fe4b9cf18cf830d12c 100644 (file)
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -79,7 +79,13 @@ if conf.has('WITH_LIBXL')
   }
 
   virt_install_dirs += [
+    confdir / 'libxl',
+    confdir / 'libxl' / 'autostart',
     localstatedir / 'lib' / 'libvirt' / 'libxl',
+    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel',
+    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target',
+    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump',
+    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save',
     localstatedir / 'log' / 'libvirt' / 'libxl',
     runstatedir / 'libvirt' / 'libxl',
   ]

diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index d399556abdef45d4fbb0fc1efd86657f1fe0be0c..99d4a3421364e3958c5689231ce187de65865064 100644 (file)
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -176,6 +176,8 @@ if conf.has('WITH_LXC')
   }
 
   virt_install_dirs += [
+    confdir / 'lxc',
+    confdir / 'lxc' / 'autostart',
     localstatedir / 'lib' / 'libvirt' / 'lxc',
     localstatedir / 'log' / 'libvirt' / 'lxc',
     runstatedir / 'libvirt' / 'lxc',

diff --git a/src/meson.build b/src/meson.build
index fc6c77f5d17b838d4c4395eb63ee9646b8f4a9bb..3890df7124f3aae487753b0dd299b36c80ac83e0 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -210,7 +210,7 @@ openrc_init_files = []
 
 # virt_install_dirs:
 #   list of directories to create during installation
-virt_install_dirs = []
+virt_install_dirs = [ confdir ]
 
 # driver_source_files:
 #   driver source files to check

diff --git a/src/network/meson.build b/src/network/meson.build
index e7c43bc4c48a6e2ee1ac9a9d7c46196414396bd6..b5eff0c3ab6bcb9b47c0d5c713860f9823fe91d3 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -73,6 +73,8 @@ if conf.has('WITH_NETWORK')
   }
 
   virt_install_dirs += [
+    confdir / 'qemu' / 'networks',
+    confdir / 'qemu' / 'networks' / 'autostart',
     localstatedir / 'lib' / 'libvirt' / 'network',
     localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
     runstatedir / 'libvirt' / 'network',

diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 5013d825b3f47d0d13d410f0d9630b5adf30615c..1c95975c37602a120529edf7e1254f1644de47d1 100644 (file)
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -62,4 +62,8 @@ if conf.has('WITH_NODE_DEVICES')
     'name': 'virtnodedevd',
     'in_file': files('virtnodedevd.init.in'),
   }
+
+  virt_install_dirs += [
+    runstatedir / 'libvirt' / 'nodedev',
+  ]
 endif

diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index ebbe7129064c722b188d784a6e003eb14646d2d4..55cf8fcce40e54f405bb2d25085372312aeb120d 100644 (file)
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -61,5 +61,11 @@ if conf.has('WITH_NWFILTER')
     'in_file': files('virtnwfilterd.init.in'),
   }
 
+  virt_install_dirs += [
+    confdir / 'nwfilter',
+    runstatedir / 'libvirt' / 'nwfilter-binding',
+    runstatedir / 'libvirt' / 'nwfilter',
+  ]
+
   subdir('xml')
 endif

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index b23c96353ff5157bd8f60b1784fcfe5ef21dfca5..3ea084cff864124184e896ddcd551870bf509437 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -174,12 +174,24 @@ if conf.has('WITH_QEMU')
   endif
 
   virt_install_dirs += [
+    confdir / 'qemu',
+    confdir / 'qemu' / 'autostart',
     localstatedir / 'cache' / 'libvirt' / 'qemu',
     localstatedir / 'lib' / 'libvirt' / 'qemu',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
+    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
     localstatedir / 'lib' / 'libvirt' / 'swtpm',
     localstatedir / 'log' / 'libvirt' / 'qemu',
     localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
     runstatedir / 'libvirt' / 'qemu',
+    runstatedir / 'libvirt' / 'qemu' / 'dbus',
+    runstatedir / 'libvirt' / 'qemu' / 'slirp',
     runstatedir / 'libvirt' / 'qemu' / 'swtpm',
   ]
 endif

diff --git a/src/remote/meson.build b/src/remote/meson.build
index fc98d0e5be69ce69fe467790ca1cc58bf1096e0f..b2aafe6320f2ec63cdba5c715646ee74a6145bd4 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -236,6 +236,8 @@ if conf.has('WITH_REMOTE')
 
     virt_install_dirs += [
       localstatedir / 'log' / 'libvirt',
+      runstatedir / 'libvirt',
+      runstatedir / 'libvirt' / 'common',
     ]
 
     logrotate_conf = configuration_data()

diff --git a/src/secret/meson.build b/src/secret/meson.build
index efc0ebb1e6d511169bc95e5ecfdd52dbbd5b44e9..1bda59849b4986499e12998a8df32f2526cda53f 100644 (file)
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -43,4 +43,9 @@ if conf.has('WITH_SECRETS')
     'name': 'virtsecretd',
     'in_file': files('virtsecretd.init.in'),
   }
+
+  virt_install_dirs += [
+    confdir / 'secrets',
+    runstatedir / 'libvirt' / 'secrets',
+  ]
 endif

diff --git a/src/storage/meson.build b/src/storage/meson.build
index c43707461d44bc4ca7ace98d88904c84a9ad8bc7..26e7ff1a1a52e0480a6a3b71f38a3112cff393e3 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -125,6 +125,12 @@ if conf.has('WITH_STORAGE')
     'name': 'virtstoraged',
     'in_file': files('virtstoraged.init.in'),
   }
+
+  virt_install_dirs += [
+    confdir / 'storage',
+    confdir / 'storage' / 'autostart',
+    runstatedir / 'libvirt' / 'storage',
+  ]
 endif
 
 if conf.has('WITH_STORAGE_DISK')