]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
projects / thirdparty / libvirt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3d1bd8e)
meson: src: install empty directories
authorPavel Hrdina <phrdina@redhat.com>
Thu, 23 Jul 2020 10:41:32 +0000 (12:41 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Mon, 3 Aug 2020 07:27:05 +0000 (09:27 +0200)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
16 files changed:
scripts/meson-install-dirs.py [new file with mode: 0644] patch | blob
scripts/meson.build patch | blob | blame | history
src/Makefile.am patch | blob | blame | history
src/libxl/Makefile.inc.am patch | blob | blame | history
src/libxl/meson.build patch | blob | blame | history
src/locking/Makefile.inc.am patch | blob | blame | history
src/locking/meson.build patch | blob | blame | history
src/lxc/Makefile.inc.am patch | blob | blame | history
src/lxc/meson.build patch | blob | blame | history
src/meson.build patch | blob | blame | history
src/network/Makefile.inc.am patch | blob | blame | history
src/network/meson.build patch | blob | blame | history
src/qemu/Makefile.inc.am patch | blob | blame | history
src/qemu/meson.build patch | blob | blame | history
src/remote/Makefile.inc.am patch | blob | blame | history
src/remote/meson.build patch | blob | blame | history

diff --git a/scripts/meson-install-dirs.py b/scripts/meson-install-dirs.py
new file mode 100644 (file)
index 0000000..14ec6b9
--- /dev/null
+++ b/scripts/meson-install-dirs.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+destdir = os.environ.get('DESTDIR', os.sep)
+
+for dirname in sys.argv[1:]:
+    os.makedirs(os.path.join(destdir, dirname.strip(os.sep)), exist_ok=True)
diff --git a/scripts/meson.build b/scripts/meson.build
index 93ac4aa2cda5ecb4059cb5e893bbfbc951bd9956..bd641236a21737b2dd68f86a94b1bbeff401443a 100644 (file)
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -20,6 +20,7 @@ scripts = [
   'hyperv_wmi_generator.py',
   'meson-gen-def.py',
   'meson-gen-sym.py',
+  'meson-install-dirs.py',
   'meson-python.sh',
   'mock-noinline.py',
   'prohibit-duplicate-header.py',
diff --git a/src/Makefile.am b/src/Makefile.am
index 9865b2d28ea573103798d33bf269ed905599c80d..9ad50ca1a954608de5aed0595453d4207d34ffe8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,15 +234,6 @@ endif WITH_LIBVIRTD
 
 install-data-local: $(INSTALL_DATA_LOCAL) \
                $(INSTALL_DATA_DIRS:%=install-data-%)
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
 
 uninstall-local: $(UNINSTALL_LOCAL) \
                $(INSTALL_DATA_DIRS:%=uninstall-data-%)
-       rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 0031adb2ef3e964ed76271de04c4aa35115aa5ab..5af19c835124b9faa3e8f523ade614b5cb207dec 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -2,19 +2,3 @@
 
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
-
-if WITH_LIBXL
-
-INSTALL_DATA_DIRS += libxl
-
-install-data-libxl:
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
-       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/libxl"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
-
-uninstall-data-libxl:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
-       rmdir "$(DESTDIR)$(runstatedir)/libvirt/libxl" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
-
-endif WITH_LIBXL
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 5c1a533cefb0244b1be1f71f2b24793e19aef17c..da4f29f90608560423e59ec5ac7bc9dea44a98d5 100644 (file)
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -76,4 +76,10 @@ if conf.has('WITH_LIBXL')
     'name': 'virtxend',
     'file': files('virtxend.sysconf'),
   }
+
+  virt_install_dirs += [
+    localstatedir / 'lib' / 'libvirt' / 'libxl',
+    runstatedir / 'libvirt' / 'libxl',
+    localstatedir / 'log' / 'libvirt' / 'libxl',
+  ]
 endif
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 02ce2fa7a77f3fed096e3845c2ab320df49d6962..285e73a6bf45c5118d8390f9a6036fdcdb58c0b0 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -1,27 +1,3 @@
 # vim: filetype=automake
 
 RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x
-
-INSTALL_DATA_DIRS += locking
-
-install-data-locking:
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files"
-       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/lockd"
-if WITH_SANLOCK
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
-endif WITH_SANLOCK
-
-uninstall-data-locking:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||:
-       rmdir "$(DESTDIR)$(runstatedir)/libvirt/lockd" ||:
-if WITH_SANLOCK
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
-endif WITH_SANLOCK
-endif WITH_LIBVIRTD
-
-.PHONY: \
-       install-data-locking \
-       uninstall-data-locking \
-       $(NULL)
diff --git a/src/locking/meson.build b/src/locking/meson.build
index 1d42682d6086262bb6fa79abeefaa81ad4a9b845..dbff78ca1bbb5904748a5513af413c2762260653 100644 (file)
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -225,4 +225,16 @@ if conf.has('WITH_LIBVIRTD')
     'aug': files('test_virtlockd.aug.in'),
     'conf': files('virtlockd.conf'),
   }
+
+  virt_install_dirs += [
+    localstatedir / 'lib' / 'libvirt' / 'lockd',
+    localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files',
+    runstatedir / 'libvirt' / 'lockd',
+  ]
+
+  if conf.has('WITH_SANLOCK')
+    virt_install_dirs += [
+      localstatedir / 'lib' / 'libvirt' / 'sanlock',
+    ]
+  endif
 endif
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index f65b1cdf6b921da05f35cc011f14b10270e5ffa1..7f312975d6c2e6bb1ad0b3acc91998fd653d921f 100644 (file)
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -15,21 +15,4 @@ if WITH_DTRACE_PROBES
 RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
 endif
 
-INSTALL_DATA_DIRS += lxc
-
-install-data-lxc:
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
-       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/lxc"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
-
-uninstall-data-lxc:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
-       rmdir "$(DESTDIR)$(runstatedir)/libvirt/lxc" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
-
 endif WITH_LXC
-
-.PHONY: \
-       install-data-lxc \
-       uninstall-data-lxc \
-       $(NULL)
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index c8a5a9db9b2311e54ac8b8d130eeaba808530d81..1684cbec8a2d714081b4c863e7576c5e2ae1b7cb 100644 (file)
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -159,4 +159,10 @@ if conf.has('WITH_LXC')
     'name': 'virtlxcd',
     'file': files('virtlxcd.sysconf'),
   }
+
+  virt_install_dirs += [
+    localstatedir / 'lib' / 'libvirt' / 'lxc',
+    runstatedir / 'libvirt' / 'lxc',
+    localstatedir / 'log' / 'libvirt' / 'lxc',
+  ]
 endif
diff --git a/src/meson.build b/src/meson.build
index 58687b331a1537db568a9ade7c6a8e74681bcd7c..93bca01dda66b3ca6bb3efcf2d97e8fbc79f4847 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -211,6 +211,10 @@ openrc_init_files = []
 #   * file - source sysconf file (required)
 sysconf_files = []
 
+# virt_install_dirs:
+#   list of directories to create during installation
+virt_install_dirs = []
+
 
 # list subdirectories
 
@@ -800,3 +804,18 @@ foreach sysconf : sysconf_files
     rename: [ sysconf['name'] ],
   )
 endforeach
+
+
+# Install empty directories
+
+virt_install_dirs += [
+  localstatedir / 'cache' / 'libvirt',
+  localstatedir / 'lib' / 'libvirt' / 'images',
+  localstatedir / 'lib' / 'libvirt' / 'filesystems',
+  localstatedir / 'lib' / 'libvirt' / 'boot',
+]
+
+meson.add_install_script(
+  meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(),
+  virt_install_dirs,
+)
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 2202903870fa542f328fc92ea548909416a7e42f..8482f924a15fed18fbc68266cc15433fcc876536 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -10,9 +10,6 @@ INSTALL_DATA_DIRS += network
 UUID=$(shell uuidgen 2>/dev/null)
 
 install-data-network:
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
-       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/network"
        $(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart"
        $(INSTALL_DATA) $(srcdir)/network/default.xml \
          $(DESTDIR)$(confdir)/qemu/networks/default.xml
@@ -38,8 +35,6 @@ uninstall-data-network:
        rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
        rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || :
        rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
-       rmdir "$(DESTDIR)$(runstatedir)/libvirt/network" ||:
 if WITH_FIREWALLD_ZONE
        rm -f  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
 endif WITH_FIREWALLD_ZONE
diff --git a/src/network/meson.build b/src/network/meson.build
index 1b2536cfabfc3586d9940c23065266e9350f028c..cc8739e53c543abfad03711fd972ac30a28e8aa9 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -76,4 +76,10 @@ if conf.has('WITH_NETWORK')
     'name': 'virtnetworkd',
     'file': files('virtnetworkd.sysconf'),
   }
+
+  virt_install_dirs += [
+    localstatedir / 'lib' / 'libvirt' / 'network',
+    localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
+    runstatedir / 'libvirt' / 'network',
+  ]
 endif
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 6d1e9e78148f83e35c7b8b84d81846a7a5d49a6e..f665cb1f1306c33634806390ac81f3c0a2155a7f 100644 (file)
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -2,32 +2,3 @@
 
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
-
-if WITH_QEMU
-
-INSTALL_DATA_DIRS += qemu
-
-install-data-qemu:
-       $(MKDIR_P) -m 0751 "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
-       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm"
-       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu"
-
-uninstall-data-qemu:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||:
-       rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm"
-       rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu" ||:
-
-endif WITH_QEMU
-
-.PHONY: \
-       install-data-qemu \
-       uninstall-data-qemu \
-       $(NULL)
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 8f8a8d6f5499de7a1b5b65dce8c7b97f6998f27d..fd0f25c84da452359317f3bf133ffa44e09fd04a 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -160,4 +160,14 @@ if conf.has('WITH_QEMU')
     'name': 'virtqemud',
     'file': files('virtqemud.sysconf'),
   }
+
+  virt_install_dirs += [
+    localstatedir / 'lib' / 'libvirt' / 'qemu',
+    runstatedir / 'libvirt' / 'qemu',
+    localstatedir / 'cache' / 'libvirt' / 'qemu',
+    localstatedir / 'log' / 'libvirt' / 'qemu',
+    localstatedir / 'lib' / 'libvirt' / 'swtpm',
+    runstatedir / 'libvirt' / 'qemu' / 'swtpm',
+    localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
+  ]
 endif
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 14c7a8e4141222adbd1d8f68dce2e2cc1cc2da31..287dad426cb63e3957aeba761cf6960fc845eb32 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -9,14 +9,6 @@ LOGROTATE_FILES_IN += \
 
 if WITH_LIBVIRTD
 
-INSTALL_DATA_DIRS += remote
-
-install-data-remote:
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt"
-
-uninstall-data-remote:
-       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
-
 if WITH_SYSCTL
 # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
 # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
@@ -60,11 +52,6 @@ endif WITH_POLKIT
 
 endif WITH_LIBVIRTD
 
-.PHONY: \
-       install-data-remote \
-       uninstall-data-remote \
-       $(NULL)
-
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
 if WITH_SASL
diff --git a/src/remote/meson.build b/src/remote/meson.build
index d7473eaeeca80cbc9737be66d0ee6ee0fa480f62..5fef1a477c8b4e23b78fe99d6047ccc69f4fc258 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -209,6 +209,10 @@ if conf.has('WITH_REMOTE')
       'name': 'virtproxyd',
       'file': files('virtproxyd.sysconf'),
     }
+
+    virt_install_dirs += [
+      localstatedir / 'log' / 'libvirt',
+    ]
   endif
 endif
 
Mirror of https://github.com/libvirt/libvirt.git