kbd: 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: b1fa565ffa02796eaa55f5ac6700f1a932d62957)

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
2017-11-15 16:47:41 +00:00
committed by Richard Purdie
parent 395a4c8aee
commit 46a2d5ef5c

View File

@@ -13,10 +13,10 @@ run as expected.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1976333..b36aef3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
Index: kbd-2.0.4/tests/Makefile.am
===================================================================
--- kbd-2.0.4.orig/tests/Makefile.am
+++ kbd-2.0.4/tests/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = \
-I$(srcdir)/../src/libkeymap \
@@ -25,11 +25,11 @@ index 1976333..b36aef3 100644
+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\"
AM_CFLAGS = $(CHECK_CFLAGS)
LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS)
diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in
index ddd5ed8..772fb51 100755
--- a/tests/alt-is-meta.in
+++ b/tests/alt-is-meta.in
LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@
Index: kbd-2.0.4/tests/alt-is-meta.in
===================================================================
--- kbd-2.0.4.orig/tests/alt-is-meta.in
+++ kbd-2.0.4/tests/alt-is-meta.in
@@ -7,8 +7,8 @@ cd "$cwd"
rc=0
temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
@@ -41,10 +41,10 @@ index ddd5ed8..772fb51 100755
if [ "$rc" != 0 ]; then
printf 'failed\n'
diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in
index 7c856e5..14d92c1 100755
--- a/tests/dumpkeys-fulltable.in
+++ b/tests/dumpkeys-fulltable.in
Index: kbd-2.0.4/tests/dumpkeys-fulltable.in
===================================================================
--- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in
+++ kbd-2.0.4/tests/dumpkeys-fulltable.in
@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")"
cd "$cwd"