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>
This commit is contained in:
Ross Burton
2018-03-08 20:17:35 +02:00
committed by Richard Purdie
parent 27cb6b5543
commit 0275093054
2 changed files with 11 additions and 17 deletions

View File

@@ -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

View File

@@ -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