mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

automake: refresh patches

Browse Source 
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>
This commit is contained in:
Ross Burton
2018-03-08 20:17:53 +02:00
committed by Richard Purdie
parent 98e78f2e49
commit 08e76acbaf
2 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
+19 -22
View File
@@ -22,10 +22,10 @@ Signed-off-by: Serhii Popovych <spopovyc@cisco.com>
t/wrap/automake.in | 3 ++- t/wrap/automake.in | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-) 4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/bin/aclocal.in b/bin/aclocal.in Index: automake-1.15.1/bin/aclocal.in
index 349f24a..50cb8d3 100644 ===================================================================
--- a/bin/aclocal.in --- automake-1.15.1.orig/bin/aclocal.in
+++ b/bin/aclocal.in +++ automake-1.15.1/bin/aclocal.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!@PERL@ -w -#!@PERL@ -w
+#!@PERL@ +#!@PERL@
@@ -40,17 +40,17 @@ index 349f24a..50cb8d3 100644
use Automake::Config; use Automake::Config;
use Automake::General; use Automake::General;
diff --git a/bin/automake.in b/bin/automake.in Index: automake-1.15.1/bin/automake.in
index eedc8bc..e0a01cf 100644 ===================================================================
--- a/bin/automake.in --- automake-1.15.1.orig/bin/automake.in
+++ b/bin/automake.in +++ automake-1.15.1/bin/automake.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!@PERL@ -w -#!@PERL@ -w
+#!@PERL@ +#!@PERL@
# -*- perl -*- # -*- perl -*-
# @configure_input@ # @configure_input@
@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' @@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
package Automake; package Automake;
use strict; use strict;
@@ -58,16 +58,16 @@ index eedc8bc..e0a01cf 100644
BEGIN BEGIN
{ {
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in Index: automake-1.15.1/t/wrap/aclocal.in
index e64b546..9996899 100644 ===================================================================
--- a/t/wrap/aclocal.in --- automake-1.15.1.orig/t/wrap/aclocal.in
+++ b/t/wrap/aclocal.in +++ automake-1.15.1/t/wrap/aclocal.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!@PERL@ -w -#!@PERL@ -w
+#!@PERL@ +#!@PERL@
# @configure_input@ # @configure_input@
# Copyright (C) 2012-2014 Free Software Foundation, Inc. # Copyright (C) 2012-2017 Free Software Foundation, Inc.
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
BEGIN BEGIN
{ {
@@ -76,16 +76,16 @@ index e64b546..9996899 100644
@Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib'); @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib' unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
if '@srcdir@' ne '.'; if '@srcdir@' ne '.';
diff --git a/t/wrap/automake.in b/t/wrap/automake.in Index: automake-1.15.1/t/wrap/automake.in
index 8b943b1..be61226 100644 ===================================================================
--- a/t/wrap/automake.in --- automake-1.15.1.orig/t/wrap/automake.in
+++ b/t/wrap/automake.in +++ automake-1.15.1/t/wrap/automake.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!@PERL@ -w -#!@PERL@ -w
+#!@PERL@ +#!@PERL@
# @configure_input@ # @configure_input@
# Copyright (C) 2012-2014 Free Software Foundation, Inc. # Copyright (C) 2012-2017 Free Software Foundation, Inc.
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
BEGIN BEGIN
{ {
@@ -94,6 +94,3 @@ index 8b943b1..be61226 100644
@Automake::perl_libdirs = ('@abs_top_srcdir@/lib'); @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib' unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
if '@srcdir@' ne '.'; if '@srcdir@' ne '.';
--
2.3.0
meta/recipes-devtools/automake/automake/buildtest.patch
+10 -8
View File
@@ -4,20 +4,22 @@ be run separately.
Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Björn Stenberg <bjst@enea.com>
Upstream-Status: Pending Upstream-Status: Pending
--- a/lib/am/check.am 2012-11-14 13:46:16.335475995 +0100 Index: automake-1.15.1/lib/am/check.am
+++ b/lib/am/check.am 2012-08-13 18:40:12.000000000 +0200 ===================================================================
@@ -44,7 +44,7 @@ --- automake-1.15.1.orig/lib/am/check.am
am__tty_colors = $(am__tty_colors_dummy) +++ automake-1.15.1/lib/am/check.am
endif !%?COLOR% @@ -41,7 +41,7 @@ am__tty_colors = { \
fi; \
}
-.PHONY: check-TESTS -.PHONY: check-TESTS
+.PHONY: check-TESTS buildtest-TESTS runtest-TESTS +.PHONY: check-TESTS buildtest-TESTS runtest-TESTS
if %?PARALLEL_TESTS% if !%?SERIAL_TESTS%
@@ -465,7 +465,14 @@ @@ -466,7 +466,14 @@ else %?SERIAL_TESTS%
else !%?PARALLEL_TESTS% ## Obsolescent serial testsuite driver.
-check-TESTS: $(TESTS) -check-TESTS: $(TESTS)
+AM_RECURSIVE_TARGETS += buildtest runtest +AM_RECURSIVE_TARGETS += buildtest runtest