diff options
Diffstat (limited to 'meta/recipes-kernel/kmod')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | 13 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch | 15 |
2 files changed, 11 insertions, 17 deletions
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch index feafcb9b7c..5f45fce932 100644 --- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | |||
@@ -11,10 +11,10 @@ Upstream-Status: Inappropriate (disable feature incompatible with ptest) | |||
11 | configure.ac | 2 +- | 11 | configure.ac | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/configure.ac b/configure.ac | 14 | Index: git/configure.ac |
15 | index eb0f9d1..a539968 100644 | 15 | =================================================================== |
16 | --- a/configure.ac | 16 | --- git.orig/configure.ac |
17 | +++ b/configure.ac | 17 | +++ git/configure.ac |
18 | @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS | 18 | @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS |
19 | AC_SYS_LARGEFILE | 19 | AC_SYS_LARGEFILE |
20 | AC_PREFIX_DEFAULT([/usr]) | 20 | AC_PREFIX_DEFAULT([/usr]) |
@@ -23,7 +23,4 @@ index eb0f9d1..a539968 100644 | |||
23 | +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) | 23 | +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) |
24 | AM_SILENT_RULES([yes]) | 24 | AM_SILENT_RULES([yes]) |
25 | LT_INIT([disable-static pic-only]) | 25 | LT_INIT([disable-static pic-only]) |
26 | 26 | DOLT | |
27 | -- | ||
28 | 1.9.1 | ||
29 | |||
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch index 8161d6128d..5d9d40c387 100644 --- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch +++ b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch | |||
@@ -18,12 +18,12 @@ Upstream-Status: Pending | |||
18 | libkmod/libkmod-internal.h | 4 ++++ | 18 | libkmod/libkmod-internal.h | 4 ++++ |
19 | 1 file changed, 4 insertions(+) | 19 | 1 file changed, 4 insertions(+) |
20 | 20 | ||
21 | diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h | 21 | Index: git/libkmod/libkmod-internal.h |
22 | index 0180124..100b40f 100644 | 22 | =================================================================== |
23 | --- a/libkmod/libkmod-internal.h | 23 | --- git.orig/libkmod/libkmod-internal.h |
24 | +++ b/libkmod/libkmod-internal.h | 24 | +++ git/libkmod/libkmod-internal.h |
25 | @@ -9,6 +9,10 @@ | 25 | @@ -10,6 +10,10 @@ |
26 | #include "macro.h" | 26 | |
27 | #include "libkmod.h" | 27 | #include "libkmod.h" |
28 | 28 | ||
29 | +#ifndef O_CLOEXEC | 29 | +#ifndef O_CLOEXEC |
@@ -33,6 +33,3 @@ index 0180124..100b40f 100644 | |||
33 | static _always_inline_ _printf_format_(2, 3) void | 33 | static _always_inline_ _printf_format_(2, 3) void |
34 | kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} | 34 | kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} |
35 | 35 | ||
36 | -- | ||
37 | 1.7.10.4 | ||
38 | |||