diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2014-11-05 12:03:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-09 10:21:19 +0000 |
| commit | 2020ba7c48793c2a628d90b63fd91d5c283de5ca (patch) | |
| tree | b3c4fc41ab50764017accb6ec26e4bc6a16c626f | |
| parent | 45bb9e3323073070453647a32289dc1792f3d660 (diff) | |
| download | poky-2020ba7c48793c2a628d90b63fd91d5c283de5ca.tar.gz | |
ltp: update to 20140828 release
bump SRCREV to 20140828 tag
drop automake-foreign patch - fixed upstream (commit 18594de and edbae29)
add add-know-for-tirpc patch - workaround ftbfs with libtirpc found
update realtime tests fixes upstream status from submitted to backported -
merged upstream
(From OE-Core rev: a1dacd52d8bad948dcea3c39278da1d87e3167af)
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/automake-foreign.patch | 20 | ||||
| -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. | |||
| 9 | Replaced the invalid variable name with the variable actually created | 9 | Replaced the invalid variable name with the variable actually created |
| 10 | by autoconf. | 10 | by autoconf. |
| 11 | 11 | ||
| 12 | Upstream-Status: Submitted | 12 | Upstream-Status: Backported |
| 13 | 13 | ||
| 14 | Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> | 14 | Signed-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 | |||
| 9 | for robust mutexes. Changed these conditionals to use the config | 9 | for robust mutexes. Changed these conditionals to use the config |
| 10 | variables actually generated in the autoconf process. | 10 | variables actually generated in the autoconf process. |
| 11 | 11 | ||
| 12 | Upstream-Status: Submitted | 12 | Upstream-Status: Backported |
| 13 | 13 | ||
| 14 | Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> | 14 | Signed-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 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | tirpc support is broken upstream. in the meantime, allow to disable tirpc. | ||
| 6 | |||
| 7 | Signed-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 @@ | |||
| 1 | Use foreign strictness to avoid automake errors. | ||
| 2 | |||
| 3 | Upstream-Status: Submitted (https://github.com/linux-test-project/ltp/issues/16) | ||
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 5 | |||
| 6 | diff --git a/configure.ac b/configure.ac | ||
| 7 | index 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 | ||
| 22 | DEPENDS = "attr libaio libcap acl openssl zip-native" | 22 | DEPENDS = "attr libaio libcap acl openssl zip-native" |
| 23 | SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b" | 23 | SRCREV = "2c341ad9177f36d9b953e84dee8cf88498286fe5" |
| 24 | 24 | ||
| 25 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ | 25 | SRC_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 | ||
| 35 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
| @@ -44,6 +44,8 @@ export exec_prefix = "/opt/ltp" | |||
| 44 | PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," | 44 | PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," |
| 45 | EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" | 45 | EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" |
| 46 | EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " | 46 | EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " |
| 47 | # ltp network/rpc test cases ftbfs when libtirpc is found | ||
| 48 | EXTRA_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. |
