kmod: avoid parallel-tests

buildtest-TESTS and runtest-TESTS targets are required by ptest.
In order to have those targets in automake 1.13.4, serial-tests
should be specified since parallel test is assumed by default
and serial-tests is optional.

(From OE-Core rev: b7a0e1c351e396af6470e59c428128789295bd96)

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 7 insertions, 4 deletions

diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 8a18547c55..f8d5bac743 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -23,7 +23,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
            file://depmod-search.conf \
            file://run-ptest \
            file://ptest.patch \
-           file://remove_parallel_tests.patch \
+           file://avoid_parallel_tests.patch \
            file://fix-seperatebuilddir.patch \
           "
 
diff --git a/meta/recipes-kernel/kmod/kmod/remove_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index ee1942806b..4c37d44836 100644
--- a/meta/recipes-kernel/kmod/kmod/remove_parallel_tests.patch
+++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
@@ -1,18 +1,21 @@
 Avoid parallel-tests as it remove
-buildtest-TESTS and runtest-TESTS targets
+buildtest-TESTS and runtest-TESTS targets required by ptest.
+In automake 1.13.4 parallel-tests is assumed by defauls.
+In order to have buildtest-TESTS and runtest-TESTS targets
+serial-tests is now required
 
 Signed-off-by: Tudor Florea <tudor.florea@enea.com>
 Upstream-Status: Inappropriate (disable feature incompatible with ptest) 
 
 diff -ruN a/configure.ac b/configure.ac
 --- a/configure.ac      2013-09-02 15:05:18.662366800 +0200
-+++ b/configure.ac      2013-09-02 15:05:49.557066764 +0200
++++ b/configure.ac      2013-11-28 09:26:49.557066764 +0200
 @@ -8,7 +8,7 @@
  AC_CONFIG_SRCDIR([libkmod/libkmod.c])
  AC_CONFIG_AUX_DIR([build-aux])
  AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules
 -       tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests])
-+       tar-pax no-dist-gzip dist-xz subdir-objects color-tests])
++       tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests])
  AC_PROG_CC_STDC
  AC_USE_SYSTEM_EXTENSIONS
  AC_SYS_LARGEFILE