Skip to contentSkip to conversation

package/rt-tests: add support to build without numactl

PATCH New Andreas Klinger 2 participants 2 messages Dec 27, 2020 – Dec 28, 2020

lore
Share & tools
lore

Andreas Klinger

author
#0 lore raw

PATCH v4 1/1 package/rt-tests: add support to build without numactl

rt-tests don't show up in config menu and is not build if BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS is not available on the target architecture. In such a case numactl is also not available what applies for most small embedded targets.

This dependency was introduced with commit 7f50cbfb800e ("package/rt-tests: bump to version 1.8")

But rt-tests can also be build without numactl when passing NUMA=0 to make. This possibility is documented on
https://wiki.linuxfoundation.org/realtime/documentation/howto/tools/rt-tests

Change Config.in and makefile to build without numactl by passing NUMA=0.

Changes in v4:
- make numactl an optional dependency.

Changes in v3:
- make use of numactl dependency only if BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS is set.

Changes in v2:
- Thanks to the review of Baruch patch is simplified and directly disabling NUMA by querying for !BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS.

Signed-off-by Andreas Klinger <[email protected]>
---
 package/rt-tests/Config.in   | 3 ---
 package/rt-tests/rt-tests.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
package/rt-tests/Config.in +0 -3
index cc9b14dccb..21bf9e649b 100644
@@ -5,8 +5,6 @@ config BR2_PACKAGE_RT_TESTS
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS # dlopen
 	depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest
-	depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS
-	select BR2_PACKAGE_NUMACTL
 	help
 	  Set of utilities for testing the real-time behaviour of a
 	  Linux system.

@@ -34,4 +32,3 @@ comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 3.14, dy
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
 		|| BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
 	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS
package/rt-tests/rt-tests.mk +7 -1
index 26c257213b..7761beeb52 100644
@@ -9,13 +9,19 @@ RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
 RT_TESTS_VERSION = 1.9
 RT_TESTS_LICENSE = GPL-2.0+
 RT_TESTS_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_NUMACTL),y)
 RT_TESTS_DEPENDENCIES = numactl
+else
+RT_TESTS_MAKE_OPTS += NUMA=0
+endif
 
 define RT_TESTS_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		prefix=/usr
+		prefix=/usr \
+		$(RT_TESTS_MAKE_OPTS)
 endef
 
 define RT_TESTS_INSTALL_TARGET_CMDS
Signature · 1 line
2.20.1
Applied
#1 lore raw

PATCH v4 1/1 package/rt-tests: add support to build without numactl

Quoted 25 lines · On Sun, 27 Dec 2020 22:28:33 +0100 Andreas Klinger <[email protected]> wrote:

rt-tests don't show up in config menu and is not build if BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS is not available on the target architecture. In such a case numactl is also not available what applies for most small embedded targets.

This dependency was introduced with commit 7f50cbfb800e ("package/rt-tests: bump to version 1.8")

But rt-tests can also be build without numactl when passing NUMA=0 to make. This possibility is documented on
https://wiki.linuxfoundation.org/realtime/documentation/howto/tools/rt-tests

Change Config.in and makefile to build without numactl by passing NUMA=0.

Changes in v4:
- make numactl an optional dependency.

Changes in v3:
- make use of numactl dependency only if BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS is set.

Changes in v2:
- Thanks to the review of Baruch patch is simplified and directly disabling NUMA by querying for !BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS.

Quoted 5 lines
Signed-off-by Andreas Klinger <[email protected]>
---
 package/rt-tests/Config.in   | 3 ---
 package/rt-tests/rt-tests.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com