summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:45:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commitda5622b7a90ccb978658bee3102b27a0764fa7e6 (patch)
tree3295c572aeca6970e2ba78732a23f63722396766 /meta
parent3cc4408f3adb2a70da04425adb68ae1dca03d2a9 (diff)
downloadpoky-da5622b7a90ccb978658bee3102b27a0764fa7e6.tar.gz
screen: 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: e0a363d3374738d1bc8a0889dade83d2c35ef964) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch19
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
index b5d71cc1b4..a01dc24751 100644
--- a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
+++ b/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
@@ -15,19 +15,16 @@ Subject: [PATCH] comm.h now depends on term.h
15 src/Makefile.in | 2 +- 15 src/Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/src/Makefile.in b/src/Makefile.in 18Index: screen-4.6.1/Makefile.in
19index e791e79..d4f7c0b 100644 19===================================================================
20--- a/Makefile.in 20--- screen-4.6.1.orig/Makefile.in
21+++ b/Makefile.in 21+++ screen-4.6.1/Makefile.in
22@@ -113,7 +113,7 @@ term.h: term.c term.sh 22@@ -133,7 +133,7 @@ kmapdef.c: term.h
23 23 tty.c: tty.sh
24 kmapdef.c: term.h 24 sh $(srcdir)/tty.sh tty.c
25 25
26-comm.h: comm.c comm.sh config.h 26-comm.h: comm.c comm.sh config.h
27+comm.h: comm.c comm.sh config.h term.h 27+comm.h: comm.c comm.sh config.h term.h
28 AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh 28 AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
29 29
30 docs: 30 osdef.h: osdef.sh config.h osdef.h.in
31--
322.4.1
33