From 2ac1a0c13fb760e426e958c27202c43869d036aa Mon Sep 17 00:00:00 2001 From: Stefan Hellermann Date: Mon, 6 Jan 2025 18:15:58 +0100 Subject: [PATCH] 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 Reviewed-by: Michal Privoznik --- meson.build | 4 ++-- src/storage/parthelper.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 65010dd6a8..c1a2e6eadb 100644 --- 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 ee07ba41bb..1169ebfb64 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -31,7 +31,6 @@ #include #include -#include #include #include #include