python: 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: 0b25fcee333e6207a8596d26adfa65fec85c26df)

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:18:02 +02:00
committed by Richard Purdie
parent e5f5aa5604
commit fe9e4bbee7
7 changed files with 57 additions and 81 deletions

View File

@@ -8,9 +8,11 @@ Upstream-Status: Inappropriate [OE specific]
Makefile.pre.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1306,8 +1306,8 @@ touch:
Index: Python-3.5.3/Makefile.pre.in
===================================================================
--- Python-3.5.3.orig/Makefile.pre.in
+++ Python-3.5.3/Makefile.pre.in
@@ -1574,8 +1574,8 @@ touch:
# Sanitation targets -- clean leaves libraries, executables and tags
# files, which clobber removes as well
pycremoval:
@@ -21,7 +23,7 @@ Upstream-Status: Inappropriate [OE specific]
rmtestturds:
-rm -f *BAD *GOOD *SKIPPED
@@ -1321,9 +1321,9 @@ docclean:
@@ -1589,9 +1589,9 @@ docclean:
-rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils
clean: pycremoval
@@ -32,5 +34,5 @@ Upstream-Status: Inappropriate [OE specific]
+ find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';'
+ find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
find build -name 'fficonfig.h' -exec rm -f {} ';' || true
find build -name 'fficonfig.py' -exec rm -f {} ';' || true
-rm -f Lib/lib2to3/*Grammar*.pickle
find build -name '*.py' -exec rm -f {} ';' || true
find build -name '*.py[co]' -exec rm -f {} ';' || true