summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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
commit395a4c8aee0d8fb93ecfc43c3d8bfc680a3fd438 (patch)
tree6f644505ef2237f075edb4df1e47f01baa8278c0 /meta/recipes-core
parent9fc1378a53f335dd1153d50f5f764f6a51b4414a (diff)
downloadpoky-395a4c8aee0d8fb93ecfc43c3d8bfc680a3fd438.tar.gz
libxml: 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: d71d6854fadc96fc3c75617af3beba02952fdef6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch43
1 files changed, 20 insertions, 23 deletions
diff --git a/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch b/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
index d1ad55116a..2b92dbc8dc 100644
--- a/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
+++ b/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
@@ -15,12 +15,12 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
15 python/tests/tstLastError.py | 2 +- 15 python/tests/tstLastError.py | 2 +-
16 4 files changed, 21 insertions(+), 4 deletions(-) 16 4 files changed, 21 insertions(+), 4 deletions(-)
17 17
18diff --git a/Makefile.am b/Makefile.am 18Index: libxml2-2.9.7/Makefile.am
19index e181ee0..7960e7d 100644 19===================================================================
20--- a/Makefile.am 20--- libxml2-2.9.7.orig/Makefile.am
21+++ b/Makefile.am 21+++ libxml2-2.9.7/Makefile.am
22@@ -207,9 +207,9 @@ install-ptest: 22@@ -207,9 +207,9 @@ install-ptest:
23 install $(noinst_PROGRAMS) $(DESTDIR)) 23 install $(check_PROGRAMS) $(DESTDIR))
24 cp -r $(srcdir)/test $(DESTDIR) 24 cp -r $(srcdir)/test $(DESTDIR)
25 cp -r $(srcdir)/result $(DESTDIR) 25 cp -r $(srcdir)/result $(DESTDIR)
26- cp -r $(srcdir)/python $(DESTDIR) 26- cp -r $(srcdir)/python $(DESTDIR)
@@ -28,13 +28,13 @@ index e181ee0..7960e7d 100644
28 sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile 28 sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile
29+ $(MAKE) -C python install-ptest 29+ $(MAKE) -C python install-ptest
30 30
31 runtests: 31 runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
32 [ -d test ] || $(LN_S) $(srcdir)/test . 32 testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
33diff --git a/python/Makefile.am b/python/Makefile.am 33Index: libxml2-2.9.7/python/Makefile.am
34index 34aed96..ba3ec6a 100644 34===================================================================
35--- a/python/Makefile.am 35--- libxml2-2.9.7.orig/python/Makefile.am
36+++ b/python/Makefile.am 36+++ libxml2-2.9.7/python/Makefile.am
37@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES) 37@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class
38 38
39 $(GENERATED): $(srcdir)/generator.py $(API_DESC) 39 $(GENERATED): $(srcdir)/generator.py $(API_DESC)
40 $(PYTHON) $(srcdir)/generator.py $(srcdir) 40 $(PYTHON) $(srcdir)/generator.py $(srcdir)
@@ -51,10 +51,10 @@ index 34aed96..ba3ec6a 100644
51+.PHONY: tests test 51+.PHONY: tests test
52 tests test: all 52 tests test: all
53 cd tests && $(MAKE) tests 53 cd tests && $(MAKE) tests
54diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am 54Index: libxml2-2.9.7/python/tests/Makefile.am
55index 95ebead..418e21e 100644 55===================================================================
56--- a/python/tests/Makefile.am 56--- libxml2-2.9.7.orig/python/tests/Makefile.am
57+++ b/python/tests/Makefile.am 57+++ libxml2-2.9.7/python/tests/Makefile.am
58@@ -59,6 +59,11 @@ XMLS= \ 58@@ -59,6 +59,11 @@ XMLS= \
59 CLEANFILES = core tmp.xml *.pyc 59 CLEANFILES = core tmp.xml *.pyc
60 60
@@ -81,10 +81,10 @@ index 95ebead..418e21e 100644
81+ 81+
82 tests: 82 tests:
83 endif 83 endif
84diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py 84Index: libxml2-2.9.7/python/tests/tstLastError.py
85index d5f9be7..3e5bef8 100755 85===================================================================
86--- a/python/tests/tstLastError.py 86--- libxml2-2.9.7.orig/python/tests/tstLastError.py
87+++ b/python/tests/tstLastError.py 87+++ libxml2-2.9.7/python/tests/tstLastError.py
88@@ -25,7 +25,7 @@ class TestCase(unittest.TestCase): 88@@ -25,7 +25,7 @@ class TestCase(unittest.TestCase):
89 when the exception is raised, check the libxml2.lastError for 89 when the exception is raised, check the libxml2.lastError for
90 expected values.""" 90 expected values."""
@@ -94,6 +94,3 @@ index d5f9be7..3e5bef8 100755
94 try: 94 try:
95 f(*args) 95 f(*args)
96 except exc: 96 except exc:
97--
982.12.0
99