From mboxrd@z Thu Jan  1 00:00:00 1970
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 27 Dec 2020 20:56:15 +0200
Subject: [Buildroot] [PATCH v2] package/rt-tests: add support to build
 without numactl
In-Reply-To: <20201227184132.GA4903@arbad>
References: <20201227184132.GA4903@arbad>
Message-ID: <871rfb9iy8.fsf@tarshish>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Hi Andreas,

On Sun, Dec 27 2020, Andreas Klinger 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 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 <ak@it-klinger.de>
> ---
>  package/rt-tests/Config.in   | 4 +---
>  package/rt-tests/rt-tests.mk | 7 ++++++-
>  2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
> index cc9b14dccb..4e7fa50a1a 100644
> --- a/package/rt-tests/Config.in
> +++ b/package/rt-tests/Config.in
> @@ -5,8 +5,7 @@ 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
> +	select BR2_PACKAGE_NUMACTL if BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS
>  	help
>  	  Set of utilities for testing the real-time behaviour of a
>  	  Linux system.
> @@ -34,4 +33,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
> diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
> index 26c257213b..c6c1a69f0d 100644
> --- a/package/rt-tests/rt-tests.mk
> +++ b/package/rt-tests/rt-tests.mk
> @@ -11,11 +11,16 @@ RT_TESTS_LICENSE = GPL-2.0+
>  RT_TESTS_LICENSE_FILES = COPYING
>  RT_TESTS_DEPENDENCIES = numactl

This should depend on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS. Otherwise
numactl will build on unsupported architectures.

> +ifneq ($(BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS),y)

Positive logic is better. You need 'ifeq' anyway for the numactl
dependency.

baruch

> +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


-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -