From 7b5b8e4f968d51ca194f664f12ad98388db6a6bb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Aug 2022 20:27:33 +0200 Subject: [PATCH] Revert "package/libvirtd: fix recursive dependency in Kconfig" This reverts commit f81242ae4fb64ab85af5d38e70246222276552ae to avoid the following build failure: Makefile:575: *** libbsd is in the dependency chain of netcat-openbsd that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/aada1d92df6cab0d01e27431b7b7483e3d165e79 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ecf49374ee622c7b8ff0ac8d5cb223a9b65141b3) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index af0fc36aea..65226af336 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,13 +44,15 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPROUTE2 # These are required because there is no way to unequivocally select a modern netcat - select BR2_PACKAGE_NETCAT_OPENBSD if !BR2_PACKAGE_NMAP_NCAT + select BR2_PACKAGE_NMAP if !BR2_PACKAGE_NETCAT_OPENBSD + select BR2_PACKAGE_NMAP_NCAT if !BR2_PACKAGE_NETCAT_OPENBSD select BR2_PACKAGE_RADVD help Build the libvirt daemon (libvirtd) otherwise build only the