summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit3dc8a2bef3eec4614678a3de9c6546d23393f64b (patch)
tree473ddf7f75febbad6692a36e7c32c50e75053789 /meta
parent1d93df6fddab099598b4a611a04aa6c1f0cfbf26 (diff)
downloadpoky-3dc8a2bef3eec4614678a3de9c6546d23393f64b.tar.gz
bash: 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: 33dadb98c10fdf04d9ed9b6ba57de6257873bcea) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/bash/bash/execute_cmd.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-extended/bash/bash/execute_cmd.patch b/meta/recipes-extended/bash/bash/execute_cmd.patch
index 81f8f0a9cd..9970b4d8f9 100644
--- a/meta/recipes-extended/bash/bash/execute_cmd.patch
+++ b/meta/recipes-extended/bash/bash/execute_cmd.patch
@@ -1,8 +1,10 @@
1Upstream-Status: Inappropriate [embedded specific] 1Upstream-Status: Inappropriate [embedded specific]
2 2
3--- execute_cmd.c.orig Fri Jun 3 13:34:42 2011 3Index: execute_cmd.c
4+++ execute_cmd.c Fri Jun 3 13:36:41 2011 4===================================================================
5@@ -2202,7 +2202,11 @@ 5--- execute_cmd.c.orig
6+++ execute_cmd.c
7@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous,
6 /* If the `lastpipe' option is set with shopt, and job control is not 8 /* If the `lastpipe' option is set with shopt, and job control is not
7 enabled, execute the last element of non-async pipelines in the 9 enabled, execute the last element of non-async pipelines in the
8 current shell environment. */ 10 current shell environment. */
@@ -13,5 +15,5 @@ Upstream-Status: Inappropriate [embedded specific]
13+#endif 15+#endif
14+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) 16+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
15 { 17 {
16 lstdin = move_to_high_fd (0, 0, 255); 18 lstdin = move_to_high_fd (0, 1, -1);
17 if (lstdin > 0) 19 if (lstdin > 0)