[Buildroot] [PATCH v6 2/6] package/kvm-unit-tests: update dependencies

["Alex Bennée" <alex.bennee@linaro.org>]

To run the tests we need a system QEMU, timeout, getconf and nmap-ncat
so update the select/depends for them. As we need at least GCC 8 we
can drop the specific requirement for old x86-64 tests.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <th.huth@posteo.eu>

---
v2
  - remove old gcc notes as we need at least 8 anyway
  - select QEMU and other runtime deps
  - mention the runtime deps
  - add support for getconf from external toolchain
  - update comment fallback
v5
  - keep i386/x86-64 target/host comments
  - add !BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET to comment deps
---
 package/kvm-unit-tests/Config.in | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in
index 817d3c4a8f..74c32f46e0 100644
--- a/package/kvm-unit-tests/Config.in
+++ b/package/kvm-unit-tests/Config.in
@@ -16,11 +16,20 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS
 config BR2_PACKAGE_KVM_UNIT_TESTS
 	bool "kvm-unit-tests"
 	depends on BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS
-	# on i386 and x86-64, __builtin_reachable is used, so we need
-	# gcc 4.5 at least. on i386, we use the target gcc, while on
+	# On i386, we use the target gcc, while on
 	# x86-64 we use the host gcc (see .mk file for details)
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || !BR2_i386
 	depends on BR2_HOSTARCH = "x86_64" || !BR2_x86_64
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # qemu
+	depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
+	depends on (BR2_PACKAGE_GLIBC_UTILS || \
+		    BR2_UCLIBC_INSTALL_UTILS || \
+		    BR2_TOOLCHAIN_EXTERNAL_LIBC_UTILS_COPY) # runtime getconf
+	select BR2_PACKAGE_QEMU
+	select BR2_PACKAGE_QEMU_SYSTEM # runtime for qemu-system-$ARCH
+	select BR2_PACKAGE_COREUTILS # runtime for timeout
+	select BR2_PACKAGE_BASH # runtime
+	select BR2_PACKAGE_NMAP
+	select BR2_PACKAGE_NMAP_NCAT # runtime for ncat
 	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64
 	help
 	  kvm-unit-tests is a project as old as KVM. As its name
@@ -40,6 +49,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS
 
 	  http://www.linux-kvm.org/page/KVM-unit-tests
 
-comment "kvm-unit-tests needs a toolchain w/ gcc >= 4.5"
+comment "kvm-unit-tests needs a toolchain w/ utils, gcc >= 8 and qemu"
 	depends on BR2_i386
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8
+	depends on !(BR2_PACKAGE_GLIBC_UTILS || \
+		BR2_UCLIBC_INSTALL_UTILS || \
+		BR2_TOOLCHAIN_EXTERNAL_LIBC_UTILS_COPY)
+	depends on !BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot