summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commit02750930545bd13f6d6fa7e8169f49badf03a083 (patch)
treebca3ca883bc830ea33319aacd187fa051c087937
parent27cb6b554342929c78b40189afdc4a62340a2cf2 (diff)
downloadpoky-02750930545bd13f6d6fa7e8169f49badf03a083.tar.gz
poky-02750930545bd13f6d6fa7e8169f49badf03a083.tar.bz2
poky-02750930545bd13f6d6fa7e8169f49badf03a083.zip
kmod: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: c94152fee766297b355fec7f6d3d4d8ba7ae5f86) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch13
-rw-r--r--meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch15
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)
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index eb0f9d1..a539968 100644
---- a/configure.ac
-+++ b/configure.ac
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
AC_PREFIX_DEFAULT([/usr])
@@ -23,7 +23,4 @@ index eb0f9d1..a539968 100644
+AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests])
AM_SILENT_RULES([yes])
LT_INIT([disable-static pic-only])
-
---
-1.9.1
-
+ DOLT
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
libkmod/libkmod-internal.h | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
-index 0180124..100b40f 100644
---- a/libkmod/libkmod-internal.h
-+++ b/libkmod/libkmod-internal.h
-@@ -9,6 +9,10 @@
- #include "macro.h"
+Index: git/libkmod/libkmod-internal.h
+===================================================================
+--- git.orig/libkmod/libkmod-internal.h
++++ git/libkmod/libkmod-internal.h
+@@ -10,6 +10,10 @@
+
#include "libkmod.h"
+#ifndef O_CLOEXEC
@@ -33,6 +33,3 @@ index 0180124..100b40f 100644
static _always_inline_ _printf_format_(2, 3) void
kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
---
-1.7.10.4
-