diff mbox series

[v3,1/2] Revert "package/libvirtd: fix recursive dependency in Kconfig"

Message ID 20220814182734.2878423-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [v3,1/2] Revert "package/libvirtd: fix recursive dependency in Kconfig" | expand

Commit Message

Fabrice Fontaine Aug. 14, 2022, 6:27 p.m. UTC
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 <fontaine.fabrice@gmail.com>
---
Changes v2 -> v3 (after review of Thomas Petazzoni):
 - Always mandate C++ instead of glibc
 
Changes v1 -> v2 (after review of Yann E. Morin):
 - Fix patch (rebase on top of current master)

 package/libvirt/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Yann E. MORIN Aug. 15, 2022, 9:41 a.m. UTC | #1
Fabrice, All,

On 2022-08-14 20:27 +0200, Fabrice Fontaine spake thusly:
> 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 <fontaine.fabrice@gmail.com>

Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> Changes v2 -> v3 (after review of Thomas Petazzoni):
>  - Always mandate C++ instead of glibc
>  
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Fix patch (rebase on top of current master)
> 
>  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 5a6b067a0d..afd2372d0e 100644
> --- a/package/libvirt/Config.in
> +++ b/package/libvirt/Config.in
> @@ -38,13 +38,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
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN Aug. 15, 2022, 9:57 a.m. UTC | #2
Fabrice, All,

On 2022-08-14 20:27 +0200, Fabrice Fontaine spake thusly:
> 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 <fontaine.fabrice@gmail.com>

Series of two patches applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v2 -> v3 (after review of Thomas Petazzoni):
>  - Always mandate C++ instead of glibc
>  
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Fix patch (rebase on top of current master)
> 
>  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 5a6b067a0d..afd2372d0e 100644
> --- a/package/libvirt/Config.in
> +++ b/package/libvirt/Config.in
> @@ -38,13 +38,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
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Peter Korsgaard Sept. 16, 2022, 12:04 p.m. UTC | #3
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > 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 <fontaine.fabrice@gmail.com>
 > ---
 > Changes v2 -> v3 (after review of Thomas Petazzoni):
 >  - Always mandate C++ instead of glibc
 
 > Changes v1 -> v2 (after review of Yann E. Morin):
 >  - Fix patch (rebase on top of current master)

Committed to 2022.05.x and 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in
index 5a6b067a0d..afd2372d0e 100644
--- a/package/libvirt/Config.in
+++ b/package/libvirt/Config.in
@@ -38,13 +38,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