summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mtd
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit9a260d32c1a3a8f95ba0a5c26db4bb3ba18eef18 (patch)
tree1b1a819cc6d92b89cca15d938a72fea212b73522 /meta/recipes-devtools/mtd
parented9924f814be50b56670fa43ca137eb3c7e19c2d (diff)
downloadpoky-9a260d32c1a3a8f95ba0a5c26db4bb3ba18eef18.tar.gz
mtd-utils: 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: ee40781cc12d06912457316211a08ec65e059339) 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>
Diffstat (limited to 'meta/recipes-devtools/mtd')
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch30
1 files changed, 16 insertions, 14 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
index 0e3776af04..5d874d9810 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
@@ -1,8 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100 3Index: git/jffsX-utils/mkfs.jffs2.c
4+++ git/jffsX-utils/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 4===================================================================
5@@ -100,6 +100,11 @@ 5--- git.orig/jffsX-utils/mkfs.jffs2.c
6+++ git/jffsX-utils/mkfs.jffs2.c
7@@ -100,6 +100,11 @@ struct filesystem_entry {
6 struct rb_node hardlink_rb; 8 struct rb_node hardlink_rb;
7 }; 9 };
8 10
@@ -14,7 +16,7 @@ Upstream-Status: Pending
14 struct rb_root hardlinks; 16 struct rb_root hardlinks;
15 static int out_fd = -1; 17 static int out_fd = -1;
16 static int in_fd = -1; 18 static int in_fd = -1;
17@@ -408,7 +413,7 @@ 19@@ -309,7 +314,7 @@ static struct filesystem_entry *recursiv
18 char *hpath, *tpath; 20 char *hpath, *tpath;
19 struct dirent *dp, **namelist; 21 struct dirent *dp, **namelist;
20 struct filesystem_entry *entry; 22 struct filesystem_entry *entry;
@@ -22,8 +24,8 @@ Upstream-Status: Pending
22+ struct ignorepath_entry* element = ignorepath; 24+ struct ignorepath_entry* element = ignorepath;
23 25
24 if (lstat(hostpath, &sb)) { 26 if (lstat(hostpath, &sb)) {
25 perror_msg_and_die("%s", hostpath); 27 sys_errmsg_die("%s", hostpath);
26@@ -417,6 +422,15 @@ 28@@ -318,6 +323,15 @@ static struct filesystem_entry *recursiv
27 entry = add_host_filesystem_entry(targetpath, hostpath, 29 entry = add_host_filesystem_entry(targetpath, hostpath,
28 sb.st_uid, sb.st_gid, sb.st_mode, 0, parent); 30 sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
29 31
@@ -38,8 +40,8 @@ Upstream-Status: Pending
38+ 40+
39 n = scandir(hostpath, &namelist, 0, alphasort); 41 n = scandir(hostpath, &namelist, 0, alphasort);
40 if (n < 0) { 42 if (n < 0) {
41 perror_msg_and_die("opening directory %s", hostpath); 43 sys_errmsg_die("opening directory %s", hostpath);
42@@ -1453,6 +1467,7 @@ 44@@ -1359,6 +1373,7 @@ static struct option long_options[] = {
43 {"root", 1, NULL, 'r'}, 45 {"root", 1, NULL, 'r'},
44 {"pagesize", 1, NULL, 's'}, 46 {"pagesize", 1, NULL, 's'},
45 {"eraseblock", 1, NULL, 'e'}, 47 {"eraseblock", 1, NULL, 'e'},
@@ -47,15 +49,15 @@ Upstream-Status: Pending
47 {"output", 1, NULL, 'o'}, 49 {"output", 1, NULL, 'o'},
48 {"help", 0, NULL, 'h'}, 50 {"help", 0, NULL, 'h'},
49 {"verbose", 0, NULL, 'v'}, 51 {"verbose", 0, NULL, 'v'},
50@@ -1500,6 +1515,7 @@ 52@@ -1409,6 +1424,7 @@ static const char helptext[] =
51 " -L, --list-compressors Show the list of the avaiable compressors\n" 53 " -L, --list-compressors Show the list of the available compressors\n"
52 " -t, --test-compression Call decompress and compare with the original (for test)\n" 54 " -t, --test-compression Call decompress and compare with the original (for test)\n"
53 " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n" 55 " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n"
54+" -I, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n" 56+" -I, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n"
55 " -o, --output=FILE Output to FILE (default: stdout)\n" 57 " -o, --output=FILE Output to FILE (default: stdout)\n"
56 " -l, --little-endian Create a little-endian filesystem\n" 58 " -l, --little-endian Create a little-endian filesystem\n"
57 " -b, --big-endian Create a big-endian filesystem\n" 59 " -b, --big-endian Create a big-endian filesystem\n"
58@@ -1666,6 +1682,7 @@ 60@@ -1566,6 +1582,7 @@ int main(int argc, char **argv)
59 char *compr_name = NULL; 61 char *compr_name = NULL;
60 int compr_prior = -1; 62 int compr_prior = -1;
61 int warn_page_size = 0; 63 int warn_page_size = 0;
@@ -63,7 +65,7 @@ Upstream-Status: Pending
63 65
64 page_size = sysconf(_SC_PAGESIZE); 66 page_size = sysconf(_SC_PAGESIZE);
65 if (page_size < 0) /* System doesn't know so ... */ 67 if (page_size < 0) /* System doesn't know so ... */
66@@ -1676,7 +1693,7 @@ 68@@ -1576,7 +1593,7 @@ int main(int argc, char **argv)
67 jffs2_compressors_init(); 69 jffs2_compressors_init();
68 70
69 while ((opt = getopt_long(argc, argv, 71 while ((opt = getopt_long(argc, argv,
@@ -72,7 +74,7 @@ Upstream-Status: Pending
72 { 74 {
73 switch (opt) { 75 switch (opt) {
74 case 'D': 76 case 'D':
75@@ -1700,6 +1717,28 @@ 77@@ -1600,6 +1617,28 @@ int main(int argc, char **argv)
76 warn_page_size = 0; /* set by user, so don't need to warn */ 78 warn_page_size = 0; /* set by user, so don't need to warn */
77 break; 79 break;
78 80
@@ -100,4 +102,4 @@ Upstream-Status: Pending
100+ 102+
101 case 'o': 103 case 'o':
102 if (out_fd != -1) { 104 if (out_fd != -1) {
103 error_msg_and_die("output filename specified more than once"); 105 errmsg_die("output filename specified more than once");