summaryrefslogtreecommitdiffstats
path: root/meta
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:34:51 -0800
commit6aa6a4699a662bfbc120a0ffe9c63af5839b8df6 (patch)
tree73c873affa6f338da8397ddd289f4d771a053f1f /meta
parentf8e48db172e96d99df729d04341033697aade2c8 (diff)
downloadpoky-6aa6a4699a662bfbc120a0ffe9c63af5839b8df6.tar.gz
squashfs-tools: 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: 319de7e44f9fc853b53f2628abaf640d8241f615) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
index d545146912..0ce7b4e8ce 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
@@ -23,7 +23,7 @@ Index: squashfs-tools/mksquashfs.c
23=================================================================== 23===================================================================
24--- squashfs-tools.orig/mksquashfs.c 24--- squashfs-tools.orig/mksquashfs.c
25+++ squashfs-tools/mksquashfs.c 25+++ squashfs-tools/mksquashfs.c
26@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st 26@@ -1261,6 +1261,10 @@ void write_dir(squashfs_inode *inode, st
27 dir_size + 3, directory_block, directory_offset, NULL, NULL, 27 dir_size + 3, directory_block, directory_offset, NULL, NULL,
28 dir, 0); 28 dir, 0);
29 29
@@ -50,9 +50,9 @@ Index: squashfs-tools/unsquashfs.c
50=================================================================== 50===================================================================
51--- squashfs-tools.orig/unsquashfs.c 51--- squashfs-tools.orig/unsquashfs.c
52+++ squashfs-tools/unsquashfs.c 52+++ squashfs-tools/unsquashfs.c
53@@ -38,6 +38,10 @@ 53@@ -42,6 +42,10 @@
54 #include <limits.h> 54 #include <sys/sysmacros.h>
55 #include <ctype.h> 55 #endif
56 56
57+#ifndef FNM_EXTMATCH 57+#ifndef FNM_EXTMATCH
58+#define FNM_EXTMATCH 0 58+#define FNM_EXTMATCH 0