diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-03-09 20:55:49 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:27:00 -0700 |
| commit | 19e4de6ebae756271a8b47712c4acff366d6e7aa (patch) | |
| tree | 1167738d71fb5312de6d5ce90842451c43ceaa91 | |
| parent | bc2d5c5c1c617d69a2577f57c7c46a69c6e0ddcc (diff) | |
| download | poky-19e4de6ebae756271a8b47712c4acff366d6e7aa.tar.gz | |
m4: 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: 87118e6a2ed6da1ceaf484c326ec6d0ac8c1b8be)
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/m4/m4/ac_config_links.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch index 275c0b2e7d..71edf59512 100644 --- a/meta/recipes-devtools/m4/m4/ac_config_links.patch +++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch | |||
| @@ -14,10 +14,11 @@ Tested on x86_64_linux (Ubuntu 8.04 and 9.10). | |||
| 14 | 14 | ||
| 15 | 2009-11-10 Esben Haabendal <eha@doredevelopment.dk> | 15 | 2009-11-10 Esben Haabendal <eha@doredevelopment.dk> |
| 16 | 16 | ||
| 17 | diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure | 17 | Index: m4-1.4.18/configure |
| 18 | --- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100 | 18 | =================================================================== |
| 19 | +++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100 | 19 | --- m4-1.4.18.orig/configure |
| 20 | @@ -14860,8 +14860,8 @@ | 20 | +++ m4-1.4.18/configure |
| 21 | @@ -24415,8 +24415,8 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFD | ||
| 21 | # only, it does not matter if we skip the link with older autoconf. | 22 | # only, it does not matter if we skip the link with older autoconf. |
| 22 | # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH | 23 | # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH |
| 23 | # builds, so use a shell variable to bypass this. | 24 | # builds, so use a shell variable to bypass this. |
| @@ -27,4 +28,4 @@ diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure | |||
| 27 | + # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" | 28 | + # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" |
| 28 | 29 | ||
| 29 | 30 | ||
| 30 | 31 | : | |