Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Romain Naour <romain.naour@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/rt-tests: remove dependency on headers >= 3.14
Date: Mon,  8 Aug 2016 00:03:18 +0200	[thread overview]
Message-ID: <1470607398-8644-2-git-send-email-romain.naour@gmail.com> (raw)
In-Reply-To: <1470607398-8644-1-git-send-email-romain.naour@gmail.com>

The dependency on kernel headers >= 3.14 was added by
b9fa6c00b1213fd038f2aed52057f22c7e18fd4b since
librttest requires __NR_sched_setattr and
__NR_sched_getattr syscalls (rt-sched).

But a follow up patch allows to remove these syscalls
from librttest. So keep rt-tests package available
for old toolchains (pre 3.14) and remove pi-stress
program if necessary.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/rt-tests/Config.in   |  5 ++---
 package/rt-tests/rt-tests.mk | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index b39856d..08967ce 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_RT_TESTS
 	bool "rt-tests"
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # deadline scheduler syscall
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS # dlopen
 	depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest
@@ -29,7 +28,7 @@ comment "rt-tests may not work on MIPS with an external uClibc toolchain"
 	depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 
-comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 3.14, dynamic library"
+comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
-		|| BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
+		|| BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_USE_MMU
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 1433106..6e42de1 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -14,15 +14,19 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
 RT_TESTS_DEPENDENCIES = python
 endif
 
-# Deadline scheduler syscalls are not defined on SuperH.
 # Remove pi_stress which depends on deadline scheduler syscalls.
-ifeq ($(BR2_sh),y)
 define RT_TESTS_REMOVE_RT_SCHED_API
 	$(SED) "s/rt-sched.o//" $(@D)/Makefile
 	$(SED) "s/pi_stress.c//" $(@D)/Makefile
 endef
-endif
+
+# Deadline scheduler syscalls are not defined on SuperH.
+# Deadline scheduler syscalls needs a toolchain w/ headers >= 3.14.
+ifeq ($(BR2_sh),y)
 RT_TESTS_POST_PATCH_HOOKS += RT_TESTS_REMOVE_RT_SCHED_API
+else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14),)
+RT_TESTS_POST_PATCH_HOOKS += RT_TESTS_REMOVE_RT_SCHED_API
+endif
 
 define RT_TESTS_BUILD_CMDS
 	$(MAKE) -C $(@D) 			\
-- 
2.5.5

  reply	other threads:[~2016-08-07 22:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-07 22:03 [Buildroot] [PATCH 1/2] package/rt-tests: remove sched_setattr/sched_getattr API for SuperH arch Romain Naour
2016-08-07 22:03 ` Romain Naour [this message]
2016-08-08  4:42 ` Baruch Siach
2016-08-09 10:34   ` Romain Naour
2016-08-09 18:30     ` Baruch Siach
2016-08-15 15:59       ` Romain Naour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470607398-8644-2-git-send-email-romain.naour@gmail.com \
    --to=romain.naour@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox