aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:46:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:33:56 -0800
commit24674afaf90491e898bfd2c12992a1b5c5e8d2f4 (patch)
tree43c5de2c3e2951daaf9f6d70e8725e41590ebec9
parent319de7e44f9fc853b53f2628abaf640d8241f615 (diff)
downloadopenembedded-core-24674afaf90491e898bfd2c12992a1b5c5e8d2f4.zip
openembedded-core-24674afaf90491e898bfd2c12992a1b5c5e8d2f4.tar.gz
openembedded-core-24674afaf90491e898bfd2c12992a1b5c5e8d2f4.tar.bz2
mtools: 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. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch20
1 files changed, 12 insertions, 8 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
index 2e2873a..8ceb0af 100644
--- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
+++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
@@ -1,8 +1,10 @@
Upstream-Status: Inappropriate [licensing]
---- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600
-+++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600
-@@ -21,6 +21,33 @@
+Index: mtools-4.0.18/configure.in
+===================================================================
+--- mtools-4.0.18.orig/configure.in
++++ mtools-4.0.18/configure.in
+@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
AC_C_CONST
AC_C_INLINE
@@ -36,9 +38,11 @@ Upstream-Status: Inappropriate [licensing]
dnl Check for configuration options
dnl Enable OS/2 extended density format disks
---- mtools-3.9.9/Makefile.in.sav 2006-04-14 15:56:19.000000000 -0600
-+++ mtools-3.9.9/Makefile.in 2006-04-14 16:15:29.315245312 -0600
-@@ -11,10 +11,11 @@
+Index: mtools-4.0.18/Makefile.in
+===================================================================
+--- mtools-4.0.18.orig/Makefile.in
++++ mtools-4.0.18/Makefile.in
+@@ -26,10 +26,11 @@ USERCFLAGS =
USERLDFLAGS =
USERLDLIBS =
@@ -54,7 +58,7 @@ Upstream-Status: Inappropriate [licensing]
# do not edit below this line
-@@ -181,7 +182,7 @@
+@@ -198,7 +199,7 @@ dvi: mtools.dvi
ps: mtools.ps
%.ps: %.dvi
@@ -62,4 +66,4 @@ Upstream-Status: Inappropriate [licensing]
+ $(DVI2PS) -f < $< > $@
pdf: mtools.pdf
- %.pdf: %.texi
+ %.pdf: %.texi sysconfdir.texi