meson: remove unneeded dependency on libdevmapper for storage_disk

In commit dfa0e11 the last direct usage of devmapper for storage_disk was
removed. There is one stale include remaining, which is unused even longer
since df1011ca. Remove the include and change meson.build so we can use
storage_disk without devmapper.

I'm running it right now with a stripped-down config on a small arm64
router with openwrt.

Signed-off-by: Stefan Hellermann <stefan@the2masters.de>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/meson.build b/meson.build
index 65010dd6a8e50a0ab9a4f1fdc35260f6a7f3e9c1..c1a2e6eadb7d7507ef2e6f9cfbe31f8cae03e6d4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1793,11 +1793,11 @@ if conf.has('WITH_LIBVIRTD')
     conf.set('WITH_STORAGE_DIR', 1)
   endif
 
-  if not get_option('storage_disk').disabled() and devmapper_dep.found() and libparted_dep.found()
+  if not get_option('storage_disk').disabled() and libparted_dep.found()
     use_storage = true
     conf.set('WITH_STORAGE_DISK', 1)
   elif get_option('storage_disk').enabled()
-    error('You must install libparted and libdevmapper to compile libvirt with disk storage driver')
+    error('You must install libparted to compile libvirt with disk storage driver')
   endif
 
   if not get_option('storage_fs').disabled()

diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index ee07ba41bbc51c7f9f78e6e35e5a7362d9d47bc1..1169ebfb64d1c705f2ea95dcf409d794dca92fbd 100644 (file)
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -31,7 +31,6 @@
 #include <config.h>
 
 #include <parted/parted.h>
-#include <libdevmapper.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>