From 50e83f59bd187c69e182b8034a34d11909f3c526 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 4 Mar 2022 18:38:51 +0100 Subject: [PATCH] package/libvirt: fix build without libvirtd Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 87f1dd7b52deedb5a7f50a43e4b1dd1d23313395) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index e7bfe6964d..5b6a451264 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -38,7 +38,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -195,7 +194,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -234,7 +236,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif