diff options
-rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch (renamed from meta/recipes-kernel/kmod/kmod/remove_parallel_tests.patch) | 9 |
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 \ | |||
23 | file://depmod-search.conf \ | 23 | file://depmod-search.conf \ |
24 | file://run-ptest \ | 24 | file://run-ptest \ |
25 | file://ptest.patch \ | 25 | file://ptest.patch \ |
26 | file://remove_parallel_tests.patch \ | 26 | file://avoid_parallel_tests.patch \ |
27 | file://fix-seperatebuilddir.patch \ | 27 | file://fix-seperatebuilddir.patch \ |
28 | " | 28 | " |
29 | 29 | ||
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 @@ | |||
1 | Avoid parallel-tests as it remove | 1 | Avoid parallel-tests as it remove |
2 | buildtest-TESTS and runtest-TESTS targets | 2 | buildtest-TESTS and runtest-TESTS targets required by ptest. |
3 | In automake 1.13.4 parallel-tests is assumed by defauls. | ||
4 | In order to have buildtest-TESTS and runtest-TESTS targets | ||
5 | serial-tests is now required | ||
3 | 6 | ||
4 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 7 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
5 | Upstream-Status: Inappropriate (disable feature incompatible with ptest) | 8 | Upstream-Status: Inappropriate (disable feature incompatible with ptest) |
6 | 9 | ||
7 | diff -ruN a/configure.ac b/configure.ac | 10 | diff -ruN a/configure.ac b/configure.ac |
8 | --- a/configure.ac 2013-09-02 15:05:18.662366800 +0200 | 11 | --- a/configure.ac 2013-09-02 15:05:18.662366800 +0200 |
9 | +++ b/configure.ac 2013-09-02 15:05:49.557066764 +0200 | 12 | +++ b/configure.ac 2013-11-28 09:26:49.557066764 +0200 |
10 | @@ -8,7 +8,7 @@ | 13 | @@ -8,7 +8,7 @@ |
11 | AC_CONFIG_SRCDIR([libkmod/libkmod.c]) | 14 | AC_CONFIG_SRCDIR([libkmod/libkmod.c]) |
12 | AC_CONFIG_AUX_DIR([build-aux]) | 15 | AC_CONFIG_AUX_DIR([build-aux]) |
13 | AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules | 16 | AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules |
14 | - tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) | 17 | - tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) |
15 | + tar-pax no-dist-gzip dist-xz subdir-objects color-tests]) | 18 | + tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) |
16 | AC_PROG_CC_STDC | 19 | AC_PROG_CC_STDC |
17 | AC_USE_SYSTEM_EXTENSIONS | 20 | AC_USE_SYSTEM_EXTENSIONS |
18 | AC_SYS_LARGEFILE | 21 | AC_SYS_LARGEFILE |