[v2] ltp: update to 20140828 release

Message ID 1415181813-23815-1-git-send-email-fathi.boudra@linaro.org
State New
Headers show

Commit Message

Fathi Boudra Nov. 5, 2014, 10:03 a.m.
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

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 ...tests-Fix-bad-priority-inheritance-conditio.patch |  2 +-
 ...ealtime-tests-Fix-robust-mutex-conditionals.patch |  2 +-
 meta/recipes-extended/ltp/ltp/automake-foreign.patch | 20 --------------------
 .../ltp/{ltp_20140422.bb => ltp_20140828.bb}         |  6 ++++--
 4 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/automake-foreign.patch
 rename meta/recipes-extended/ltp/{ltp_20140422.bb => ltp_20140828.bb} (97%)

Patch hide | download patch | download mbox

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 fa20b08..631f926 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.
 Replaced the invalid variable name with the variable actually created
 by autoconf.
 
-Upstream-Status: Submitted
+Upstream-Status: Backported
 
 Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
 ---
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 ccdd4d0..1fdd281 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
 for robust mutexes.  Changed these conditionals to use the config
 variables actually generated in the autoconf process.
 
-Upstream-Status: Submitted
+Upstream-Status: Backported
 
 Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
 ---
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 0000000..36ff4c7
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch
@@ -0,0 +1,37 @@ 
+[PATCH] add knob to control whether tirpc support should be checked
+
+Upstream-Status: Pending
+
+tirpc support is broken upstream. in the meantime, allow to disable tirpc.
+
+Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
+---
+ configure.ac |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,6 +98,13 @@ if test "x$with_python" = xyes; then
+ else
+     AC_SUBST([WITH_PYTHON],["no"])
+ fi
++
++# TI RPC
++AC_ARG_WITH([tirpc],
++  AC_HELP_STRING([--without-tirpc],
++    [without libtirpc support]),
++  [],[with_tirpc=yes],
++)
+ # END tools knobs
+ 
+ # Testsuites knobs
+@@ -182,7 +189,9 @@ LTP_CHECK_RENAMEAT
+ LTP_CHECK_FALLOCATE
+ LTP_CHECK_SYSCALL_FCNTL
+ LTP_CHECK_SYSCALL_PERF_EVENT_OPEN
++if test "x$with_tirpc" = xyes; then
+ LTP_CHECK_TIRPC
++fi
+ LTP_CHECK_TEE
+ LTP_CHECK_SPLICE
+ 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 c3dd891..0000000
--- a/meta/recipes-extended/ltp/ltp/automake-foreign.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-Use foreign strictness to avoid automake errors.
-
-Upstream-Status: Submitted (https://github.com/linux-test-project/ltp/issues/16)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index 9f397e7..fc57957 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4 +4 @@
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
---- a/utils/ffsb-6.0-rc2/configure.in
-+++ b/utils/ffsb-6.0-rc2/configure.in
-@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script.
--AC_INIT(main.c)
--AM_INIT_AUTOMAKE(ffsb, 6.0-RC2)
-+AC_INIT([ffsb], [6.0-RC2])
-+AC_CONFIG_SRCDIR([main.c])
-+AM_INIT_AUTOMAKE([foreign])
diff --git a/meta/recipes-extended/ltp/ltp_20140422.bb b/meta/recipes-extended/ltp/ltp_20140828.bb
similarity index 97%
rename from meta/recipes-extended/ltp/ltp_20140422.bb
rename to meta/recipes-extended/ltp/ltp_20140828.bb
index 5deaabf..de19bb1 100644
--- a/meta/recipes-extended/ltp/ltp_20140422.bb
+++ b/meta/recipes-extended/ltp/ltp_20140828.bb
@@ -20,16 +20,16 @@  LIC_FILES_CHKSUM = "\
 "
 
 DEPENDS = "attr libaio libcap acl openssl zip-native"
-SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b"
+SRCREV = "2c341ad9177f36d9b953e84dee8cf88498286fe5"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
     file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
     file://ltp-Do-not-link-against-libfl.patch \
-    file://automake-foreign.patch \
     file://make-setregid02-work.patch \
     file://add-knob-for-numa.patch \
     file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \
     file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \
+    file://add-knob-for-tirpc.patch \
 "
 
 S = "${WORKDIR}/git"
@@ -44,6 +44,8 @@  export exec_prefix = "/opt/ltp"
 PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl,"
 EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4"
 EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite "
+# ltp network/rpc test cases ftbfs when libtirpc is found
+EXTRA_OECONF += " --without-tirpc "
 
 # ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call.
 # we explicitly force regeneration of that directory and pass configure options.