summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch2
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch2
-rw-r--r--meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch37
-rw-r--r--meta/recipes-extended/ltp/ltp/automake-foreign.patch20
-rw-r--r--meta/recipes-extended/ltp/ltp_20140828.bb (renamed from meta/recipes-extended/ltp/ltp_20140422.bb)6
5 files changed, 43 insertions, 24 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch
index fa20b085f7..631f9265ec 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch
@@ -9,7 +9,7 @@ both referenced a non-existent autoconf configuration setting variable.
9Replaced the invalid variable name with the variable actually created 9Replaced the invalid variable name with the variable actually created
10by autoconf. 10by autoconf.
11 11
12Upstream-Status: Submitted 12Upstream-Status: Backported
13 13
14Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> 14Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
15--- 15---
diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch
index ccdd4d0bb3..1fdd281013 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch
@@ -9,7 +9,7 @@ which were not generated by autoconf in order to configure tests
9for robust mutexes. Changed these conditionals to use the config 9for robust mutexes. Changed these conditionals to use the config
10variables actually generated in the autoconf process. 10variables actually generated in the autoconf process.
11 11
12Upstream-Status: Submitted 12Upstream-Status: Backported
13 13
14Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> 14Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
15--- 15---
diff --git a/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch
new file mode 100644
index 0000000000..36ff4c775d
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch
@@ -0,0 +1,37 @@
1[PATCH] add knob to control whether tirpc support should be checked
2
3Upstream-Status: Pending
4
5tirpc support is broken upstream. in the meantime, allow to disable tirpc.
6
7Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
8---
9 configure.ac | 9 +++++++++
10 1 file changed, 9 insertions(+)
11
12--- a/configure.ac
13+++ b/configure.ac
14@@ -98,6 +98,13 @@ if test "x$with_python" = xyes; then
15 else
16 AC_SUBST([WITH_PYTHON],["no"])
17 fi
18+
19+# TI RPC
20+AC_ARG_WITH([tirpc],
21+ AC_HELP_STRING([--without-tirpc],
22+ [without libtirpc support]),
23+ [],[with_tirpc=yes],
24+)
25 # END tools knobs
26
27 # Testsuites knobs
28@@ -182,7 +189,9 @@ LTP_CHECK_RENAMEAT
29 LTP_CHECK_FALLOCATE
30 LTP_CHECK_SYSCALL_FCNTL
31 LTP_CHECK_SYSCALL_PERF_EVENT_OPEN
32+if test "x$with_tirpc" = xyes; then
33 LTP_CHECK_TIRPC
34+fi
35 LTP_CHECK_TEE
36 LTP_CHECK_SPLICE
37 LTP_CHECK_VMSPLICE
diff --git a/meta/recipes-extended/ltp/ltp/automake-foreign.patch b/meta/recipes-extended/ltp/ltp/automake-foreign.patch
deleted file mode 100644
index c3dd891395..0000000000
--- a/meta/recipes-extended/ltp/ltp/automake-foreign.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Use foreign strictness to avoid automake errors.
2
3Upstream-Status: Submitted (https://github.com/linux-test-project/ltp/issues/16)
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/configure.ac b/configure.ac
7index 9f397e7..fc57957 100644
8--- a/configure.ac
9+++ b/configure.ac
10@@ -4 +4 @@
11-AM_INIT_AUTOMAKE
12+AM_INIT_AUTOMAKE([foreign])
13--- a/utils/ffsb-6.0-rc2/configure.in
14+++ b/utils/ffsb-6.0-rc2/configure.in
15@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script.
16-AC_INIT(main.c)
17-AM_INIT_AUTOMAKE(ffsb, 6.0-RC2)
18+AC_INIT([ffsb], [6.0-RC2])
19+AC_CONFIG_SRCDIR([main.c])
20+AM_INIT_AUTOMAKE([foreign])
diff --git a/meta/recipes-extended/ltp/ltp_20140422.bb b/meta/recipes-extended/ltp/ltp_20140828.bb
index 5deaabf663..0be18a71c3 100644
--- a/meta/recipes-extended/ltp/ltp_20140422.bb
+++ b/meta/recipes-extended/ltp/ltp_20140828.bb
@@ -20,16 +20,16 @@ LIC_FILES_CHKSUM = "\
20" 20"
21 21
22DEPENDS = "attr libaio libcap acl openssl zip-native" 22DEPENDS = "attr libaio libcap acl openssl zip-native"
23SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b" 23SRCREV = "2c341ad9177f36d9b953e84dee8cf88498286fe5"
24 24
25SRC_URI = "git://github.com/linux-test-project/ltp.git \ 25SRC_URI = "git://github.com/linux-test-project/ltp.git \
26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ 26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
27 file://ltp-Do-not-link-against-libfl.patch \ 27 file://ltp-Do-not-link-against-libfl.patch \
28 file://automake-foreign.patch \
29 file://make-setregid02-work.patch \ 28 file://make-setregid02-work.patch \
30 file://add-knob-for-numa.patch \ 29 file://add-knob-for-numa.patch \
31 file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ 30 file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \
32 file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \ 31 file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \
32 file://add-knob-for-tirpc.patch \
33" 33"
34 34
35S = "${WORKDIR}/git" 35S = "${WORKDIR}/git"
@@ -44,6 +44,8 @@ export exec_prefix = "/opt/ltp"
44PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," 44PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl,"
45EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" 45EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4"
46EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " 46EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite "
47# ltp network/rpc test cases ftbfs when libtirpc is found
48EXTRA_OECONF += " --without-tirpc "
47 49
48# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. 50# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call.
49# we explicitly force regeneration of that directory and pass configure options. 51# we explicitly force regeneration of that directory and pass configure options.