summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit08e76acbafde2ff2c32d334cbffa3e7dad29554b (patch)
tree7268592dc52d774d923e2b2a4014a8ad1bf6d6bb
parent98e78f2e49bf3a77281fd581b0f1a5803615ef94 (diff)
downloadpoky-08e76acbafde2ff2c32d334cbffa3e7dad29554b.tar.gz
automake: 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: d29d95e627b2303b835a705cb7d55d1e41ddb0a7) 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>
-rw-r--r--meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch41
-rw-r--r--meta/recipes-devtools/automake/automake/buildtest.patch32
2 files changed, 36 insertions, 37 deletions
diff --git a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
index 64eb253a6e..96b5a3d6b2 100644
--- a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
+++ b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
@@ -22,10 +22,10 @@ Signed-off-by: Serhii Popovych <spopovyc@cisco.com>
22 t/wrap/automake.in | 3 ++- 22 t/wrap/automake.in | 3 ++-
23 4 files changed, 8 insertions(+), 4 deletions(-) 23 4 files changed, 8 insertions(+), 4 deletions(-)
24 24
25diff --git a/bin/aclocal.in b/bin/aclocal.in 25Index: automake-1.15.1/bin/aclocal.in
26index 349f24a..50cb8d3 100644 26===================================================================
27--- a/bin/aclocal.in 27--- automake-1.15.1.orig/bin/aclocal.in
28+++ b/bin/aclocal.in 28+++ automake-1.15.1/bin/aclocal.in
29@@ -1,4 +1,4 @@ 29@@ -1,4 +1,4 @@
30-#!@PERL@ -w 30-#!@PERL@ -w
31+#!@PERL@ 31+#!@PERL@
@@ -40,17 +40,17 @@ index 349f24a..50cb8d3 100644
40 40
41 use Automake::Config; 41 use Automake::Config;
42 use Automake::General; 42 use Automake::General;
43diff --git a/bin/automake.in b/bin/automake.in 43Index: automake-1.15.1/bin/automake.in
44index eedc8bc..e0a01cf 100644 44===================================================================
45--- a/bin/automake.in 45--- automake-1.15.1.orig/bin/automake.in
46+++ b/bin/automake.in 46+++ automake-1.15.1/bin/automake.in
47@@ -1,4 +1,4 @@ 47@@ -1,4 +1,4 @@
48-#!@PERL@ -w 48-#!@PERL@ -w
49+#!@PERL@ 49+#!@PERL@
50 # -*- perl -*- 50 # -*- perl -*-
51 # @configure_input@ 51 # @configure_input@
52 52
53@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' 53@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
54 package Automake; 54 package Automake;
55 55
56 use strict; 56 use strict;
@@ -58,16 +58,16 @@ index eedc8bc..e0a01cf 100644
58 58
59 BEGIN 59 BEGIN
60 { 60 {
61diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in 61Index: automake-1.15.1/t/wrap/aclocal.in
62index e64b546..9996899 100644 62===================================================================
63--- a/t/wrap/aclocal.in 63--- automake-1.15.1.orig/t/wrap/aclocal.in
64+++ b/t/wrap/aclocal.in 64+++ automake-1.15.1/t/wrap/aclocal.in
65@@ -1,4 +1,4 @@ 65@@ -1,4 +1,4 @@
66-#!@PERL@ -w 66-#!@PERL@ -w
67+#!@PERL@ 67+#!@PERL@
68 # @configure_input@ 68 # @configure_input@
69 69
70 # Copyright (C) 2012-2014 Free Software Foundation, Inc. 70 # Copyright (C) 2012-2017 Free Software Foundation, Inc.
71@@ -19,6 +19,7 @@ 71@@ -19,6 +19,7 @@
72 BEGIN 72 BEGIN
73 { 73 {
@@ -76,16 +76,16 @@ index e64b546..9996899 100644
76 @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib'); 76 @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
77 unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib' 77 unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
78 if '@srcdir@' ne '.'; 78 if '@srcdir@' ne '.';
79diff --git a/t/wrap/automake.in b/t/wrap/automake.in 79Index: automake-1.15.1/t/wrap/automake.in
80index 8b943b1..be61226 100644 80===================================================================
81--- a/t/wrap/automake.in 81--- automake-1.15.1.orig/t/wrap/automake.in
82+++ b/t/wrap/automake.in 82+++ automake-1.15.1/t/wrap/automake.in
83@@ -1,4 +1,4 @@ 83@@ -1,4 +1,4 @@
84-#!@PERL@ -w 84-#!@PERL@ -w
85+#!@PERL@ 85+#!@PERL@
86 # @configure_input@ 86 # @configure_input@
87 87
88 # Copyright (C) 2012-2014 Free Software Foundation, Inc. 88 # Copyright (C) 2012-2017 Free Software Foundation, Inc.
89@@ -19,6 +19,7 @@ 89@@ -19,6 +19,7 @@
90 BEGIN 90 BEGIN
91 { 91 {
@@ -94,6 +94,3 @@ index 8b943b1..be61226 100644
94 @Automake::perl_libdirs = ('@abs_top_srcdir@/lib'); 94 @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
95 unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib' 95 unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
96 if '@srcdir@' ne '.'; 96 if '@srcdir@' ne '.';
97--
982.3.0
99
diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/buildtest.patch
index 1dd5337849..c32cd1fb11 100644
--- a/meta/recipes-devtools/automake/automake/buildtest.patch
+++ b/meta/recipes-devtools/automake/automake/buildtest.patch
@@ -4,21 +4,23 @@ be run separately.
4Signed-off-by: Björn Stenberg <bjst@enea.com> 4Signed-off-by: Björn Stenberg <bjst@enea.com>
5Upstream-Status: Pending 5Upstream-Status: Pending
6 6
7--- a/lib/am/check.am 2012-11-14 13:46:16.335475995 +0100 7Index: automake-1.15.1/lib/am/check.am
8+++ b/lib/am/check.am 2012-08-13 18:40:12.000000000 +0200 8===================================================================
9@@ -44,7 +44,7 @@ 9--- automake-1.15.1.orig/lib/am/check.am
10 am__tty_colors = $(am__tty_colors_dummy) 10+++ automake-1.15.1/lib/am/check.am
11 endif !%?COLOR% 11@@ -41,7 +41,7 @@ am__tty_colors = { \
12 12 fi; \
13 }
14
13-.PHONY: check-TESTS 15-.PHONY: check-TESTS
14+.PHONY: check-TESTS buildtest-TESTS runtest-TESTS 16+.PHONY: check-TESTS buildtest-TESTS runtest-TESTS
15 17
16 if %?PARALLEL_TESTS% 18 if !%?SERIAL_TESTS%
17 19
18@@ -465,7 +465,14 @@ 20@@ -466,7 +466,14 @@ else %?SERIAL_TESTS%
19 21
20 else !%?PARALLEL_TESTS% 22 ## Obsolescent serial testsuite driver.
21 23
22-check-TESTS: $(TESTS) 24-check-TESTS: $(TESTS)
23+AM_RECURSIVE_TARGETS += buildtest runtest 25+AM_RECURSIVE_TARGETS += buildtest runtest
24+ 26+
@@ -28,6 +30,6 @@ Upstream-Status: Pending
28+ $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS 30+ $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS
29+ 31+
30+runtest-TESTS: 32+runtest-TESTS:
31 @failed=0; all=0; xfail=0; xpass=0; skip=0; \ 33 @failed=0; all=0; xfail=0; xpass=0; skip=0; \
32 srcdir=$(srcdir); export srcdir; \ 34 srcdir=$(srcdir); export srcdir; \
33 ## Make sure Solaris VPATH-expands all members of this list, even 35 ## Make sure Solaris VPATH-expands all members of this list, even