mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 15:29:40 +01:00
6aa6a4699a
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>
64 lines
1.6 KiB
Diff
64 lines
1.6 KiB
Diff
Define FNM_EXTMATCH if not defined its glibc specific define
|
|
include missing sys/stat.h for stat* function declarations
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
Index: squashfs-tools/action.c
|
|
===================================================================
|
|
--- squashfs-tools.orig/action.c
|
|
+++ squashfs-tools/action.c
|
|
@@ -44,6 +44,10 @@
|
|
#include "action.h"
|
|
#include "error.h"
|
|
|
|
+#if !defined(FNM_EXTMATCH)
|
|
+#define FNM_EXTMATCH 0
|
|
+#endif
|
|
+
|
|
/*
|
|
* code to parse actions
|
|
*/
|
|
Index: squashfs-tools/mksquashfs.c
|
|
===================================================================
|
|
--- squashfs-tools.orig/mksquashfs.c
|
|
+++ squashfs-tools/mksquashfs.c
|
|
@@ -1261,6 +1261,10 @@ void write_dir(squashfs_inode *inode, st
|
|
dir_size + 3, directory_block, directory_offset, NULL, NULL,
|
|
dir, 0);
|
|
|
|
+#if !defined(FNM_EXTMATCH)
|
|
+#define FNM_EXTMATCH 0
|
|
+#endif
|
|
+
|
|
#ifdef SQUASHFS_TRACE
|
|
{
|
|
unsigned char *dirp;
|
|
Index: squashfs-tools/pseudo.c
|
|
===================================================================
|
|
--- squashfs-tools.orig/pseudo.c
|
|
+++ squashfs-tools/pseudo.c
|
|
@@ -32,6 +32,7 @@
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
+#include <sys/stat.h>
|
|
#include <ctype.h>
|
|
|
|
#include "pseudo.h"
|
|
Index: squashfs-tools/unsquashfs.c
|
|
===================================================================
|
|
--- squashfs-tools.orig/unsquashfs.c
|
|
+++ squashfs-tools/unsquashfs.c
|
|
@@ -42,6 +42,10 @@
|
|
#include <sys/sysmacros.h>
|
|
#endif
|
|
|
|
+#ifndef FNM_EXTMATCH
|
|
+#define FNM_EXTMATCH 0
|
|
+#endif
|
|
+
|
|
struct cache *fragment_cache, *data_cache;
|
|
struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
|
|
pthread_t *thread, *inflator_thread;
|