summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:47:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:50 -0800
commit46a2d5ef5c8035c3c32abcea24aac8183774314b (patch)
tree397bcc172ad143ddca894969db24655eae437f67
parent395a4c8aee0d8fb93ecfc43c3d8bfc680a3fd438 (diff)
downloadpoky-46a2d5ef5c8035c3c32abcea24aac8183774314b.tar.gz
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>
-rw-r--r--meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch b/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
index 27d6f42aae..a9a3ab8abf 100644
--- a/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
+++ b/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
@@ -13,10 +13,10 @@ run as expected.
13 13
14Signed-off-by: Kai Kang <kai.kang@windriver.com> 14Signed-off-by: Kai Kang <kai.kang@windriver.com>
15 15
16diff --git a/tests/Makefile.am b/tests/Makefile.am 16Index: kbd-2.0.4/tests/Makefile.am
17index 1976333..b36aef3 100644 17===================================================================
18--- a/tests/Makefile.am 18--- kbd-2.0.4.orig/tests/Makefile.am
19+++ b/tests/Makefile.am 19+++ kbd-2.0.4/tests/Makefile.am
20@@ -1,7 +1,7 @@ 20@@ -1,7 +1,7 @@
21 AM_CPPFLAGS = \ 21 AM_CPPFLAGS = \
22 -I$(srcdir)/../src/libkeymap \ 22 -I$(srcdir)/../src/libkeymap \
@@ -25,11 +25,11 @@ index 1976333..b36aef3 100644
25+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\" 25+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\"
26 26
27 AM_CFLAGS = $(CHECK_CFLAGS) 27 AM_CFLAGS = $(CHECK_CFLAGS)
28 LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) 28 LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@
29diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in 29Index: kbd-2.0.4/tests/alt-is-meta.in
30index ddd5ed8..772fb51 100755 30===================================================================
31--- a/tests/alt-is-meta.in 31--- kbd-2.0.4.orig/tests/alt-is-meta.in
32+++ b/tests/alt-is-meta.in 32+++ kbd-2.0.4/tests/alt-is-meta.in
33@@ -7,8 +7,8 @@ cd "$cwd" 33@@ -7,8 +7,8 @@ cd "$cwd"
34 rc=0 34 rc=0
35 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" 35 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
@@ -41,10 +41,10 @@ index ddd5ed8..772fb51 100755
41 41
42 if [ "$rc" != 0 ]; then 42 if [ "$rc" != 0 ]; then
43 printf 'failed\n' 43 printf 'failed\n'
44diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in 44Index: kbd-2.0.4/tests/dumpkeys-fulltable.in
45index 7c856e5..14d92c1 100755 45===================================================================
46--- a/tests/dumpkeys-fulltable.in 46--- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in
47+++ b/tests/dumpkeys-fulltable.in 47+++ kbd-2.0.4/tests/dumpkeys-fulltable.in
48@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" 48@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")"
49 cd "$cwd" 49 cd "$cwd"
50 50