summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2018-02-08 18:34:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 18:05:41 +0000
commit02641ef12d681e4402fdaee1038513bfdb8c79b1 (patch)
tree4d814e6b5b49a3bc5c099c97d860d8b24ea72b20 /meta
parente4eae4ce347040965b37f6278b80585716c68d46 (diff)
downloadpoky-02641ef12d681e4402fdaee1038513bfdb8c79b1.tar.gz
ltp: fix knob to control numa support
Reported-by: Yi Zhao <yi.zhao@windriver.com> (From OE-Core rev: cf355518a479b75f3cbf57770ba0f699f85678d8) Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch31
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch50
-rw-r--r--meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch45
-rw-r--r--meta/recipes-extended/ltp/ltp_20180118.bb3
4 files changed, 83 insertions, 46 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
new file mode 100644
index 0000000000..da62687d57
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
@@ -0,0 +1,31 @@
1From 4ace68a6ba501907a0741dba5f5f155e06a74c35 Mon Sep 17 00:00:00 2001
2From: Petr Vorel <pvorel@suse.cz>
3Date: Wed, 7 Feb 2018 11:09:49 +0100
4Subject: [PATCH] configure: Fix default value of --without-numa switch in help
5
6The default value is no.
7
8Fixes: 39a85a1f1 ("configure: add knob to control numa support")
9
10Signed-off-by: Petr Vorel <pvorel@suse.cz>
11Upstream-Status: Accepted
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index b39a31d..d66ea00 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -86,7 +86,7 @@ fi
21 # Numa
22 AC_ARG_WITH([numa],
23 AC_HELP_STRING([--without-numa],
24- [without numa support (default=yes)]),
25+ [without numa support (default=no)]),
26 [with_numa=no],
27 [with_numa=yes]
28 )
29--
302.7.4
31
diff --git a/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch b/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
new file mode 100644
index 0000000000..8aaa287b76
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
@@ -0,0 +1,50 @@
1From 39a85a1f1e6624f554215ba4b6843d3689a8415e Mon Sep 17 00:00:00 2001
2From: Anders Roxell <anders.roxell@linaro.org>
3Date: Mon, 5 Feb 2018 11:56:04 +0100
4Subject: [PATCH] configure: add knob to control numa support
5
6Allow to disable numa from the top level.
7
8Based on patch:
9http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-extended/ltp?id=4c7873552e13dfdba96afca7562c398d2966ca71
10
11Reported-by: Roy Li <rongqing.li@windriver.com>
12Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
13Signed-off-by: Petr Vorel <pvorel@suse.cz>
14Upstream-Status: Accepted
15---
16 configure.ac | 10 ++++++++++
17 1 file changed, 10 insertions(+)
18
19diff --git a/configure.ac b/configure.ac
20index 5c8d4ea..b39a31d 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -83,6 +83,14 @@ else
24 AC_SUBST([WITH_EXPECT],["no"])
25 fi
26
27+# Numa
28+AC_ARG_WITH([numa],
29+ AC_HELP_STRING([--without-numa],
30+ [without numa support (default=yes)]),
31+ [with_numa=no],
32+ [with_numa=yes]
33+)
34+
35 # Perl
36 AC_ARG_WITH([perl],
37 [AC_HELP_STRING([--with-perl],
38@@ -157,7 +165,9 @@ LTP_CHECK_SELINUX
39 LTP_CHECK_SIGNAL
40 LTP_CHECK_SYSCALL_EVENTFD
41 LTP_CHECK_SYSCALL_MODIFY_LDT
42+if test "x$with_numa" = xyes; then
43 LTP_CHECK_SYSCALL_NUMA
44+fi
45 LTP_CHECK_SYSCALL_QUOTACTL
46 LTP_CHECK_SYSCALL_SIGNALFD
47 LTP_CHECK_SYSCALL_UNSHARE
48--
492.7.4
50
diff --git a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch
deleted file mode 100644
index 31460b9089..0000000000
--- a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 867ad5d5d64b9b27ee32148027532db0a00f6433 Mon Sep 17 00:00:00 2001
2From: "Roy.Li" <rongqing.li@windriver.com>
3Date: Thu, 7 Jan 2016 17:33:26 +0000
4Subject: [PATCH 02/32] Add knob to control whether numa support should be
5 checked
6
7otherwise undeterministic dependency will be generated
8during build depending upong numa being staged or not
9
10Signed-off-by: Roy.Li <rongqing.li@windriver.com>
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
13Upstream-Status: Pending
14---
15 m4/ltp-numa.m4 | 10 +++++++++-
16 1 file changed, 9 insertions(+), 1 deletion(-)
17
18diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4
19index fc3383e..44cb559 100644
20--- a/m4/ltp-numa.m4
21+++ b/m4/ltp-numa.m4
22@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA
23 dnl ----------------------------
24 dnl
25 AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [
26- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes])
27+ AC_MSG_CHECKING([for numa])
28+ AC_ARG_WITH(
29+ [numa],
30+ AC_HELP_STRING([--without-numa],
31+ [without numa support]),
32+ [],
33+ [AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes])
34 AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no])
35
36 if test "x$have_numa_headers" != "xno"; then
37@@ -42,3 +48,5 @@ exit(1);
38 AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma and it's headers version >= 2 installed.])
39 fi
40 ])
41+AC_MSG_RESULT([$with_numa])
42+])
43--
442.7.0
45
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb
index d918712c7c..028a957e37 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -24,7 +24,8 @@ CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
24SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1" 24SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1"
25 25
26SRC_URI = "git://github.com/linux-test-project/ltp.git \ 26SRC_URI = "git://github.com/linux-test-project/ltp.git \
27 file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \ 27 file://0001-configure-add-knob-to-control-numa-support.patch \
28 file://0001-configure-Fix-default-value-of-without-numa-switch-i.patch \
28 file://0003-Add-knob-to-control-tirpc-support.patch \ 29 file://0003-Add-knob-to-control-tirpc-support.patch \
29 file://0004-build-Add-option-to-select-libc-implementation.patch \ 30 file://0004-build-Add-option-to-select-libc-implementation.patch \
30 file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ 31 file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \