summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commit1aff4b01aa9517072a01671ca768738b080cc9bb (patch)
tree91817f90a4a89fb7d0dc96d9e6c6f79e91ef492c /meta
parent60681b118a88fdbc6d231e93463bdd60cdfdf8e5 (diff)
downloadpoky-1aff4b01aa9517072a01671ca768738b080cc9bb.tar.gz
e2fsprogs: 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: 6a83aca280fece30fd7c17f32f07f592f6300c6c) 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')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch12
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch30
2 files changed, 21 insertions, 21 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
index 38fb07e6e6..38e1bdb3d8 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
@@ -19,10 +19,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 misc/mke2fs.conf.in | 3 ++- 19 misc/mke2fs.conf.in | 3 ++-
20 1 file changed, 2 insertions(+), 1 deletion(-) 20 1 file changed, 2 insertions(+), 1 deletion(-)
21 21
22diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in 22Index: git/misc/mke2fs.conf.in
23index 812f7c7..0280398 100644 23===================================================================
24--- a/misc/mke2fs.conf.in 24--- git.orig/misc/mke2fs.conf.in
25+++ b/misc/mke2fs.conf.in 25+++ git/misc/mke2fs.conf.in
26@@ -11,8 +11,9 @@ 26@@ -11,8 +11,9 @@
27 features = has_journal 27 features = has_journal
28 } 28 }
@@ -32,5 +32,5 @@ index 812f7c7..0280398 100644
32 inode_size = 256 32 inode_size = 256
33+ auto_64-bit_support = 1 33+ auto_64-bit_support = 1
34 } 34 }
35 ext4dev = { 35 small = {
36 features = has_journal,extent,huge_file,flex_bg,uninit_bg,inline_data,64bit,dir_nlink,extra_isize 36 blocksize = 1024
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
index 7df0967637..7c4bb39fd7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Inappropriate 1Upstream-Status: Inappropriate
2 2
3diff --git a/tests/Makefile.in b/tests/Makefile.in 3Index: git/tests/Makefile.in
4index c130f4a..d2ade03 100644 4===================================================================
5--- a/tests/Makefile.in 5--- git.orig/tests/Makefile.in
6+++ b/tests/Makefile.in 6+++ git/tests/Makefile.in
7@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf 7@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile
8 @echo "#!/bin/sh" > test_one 8 @echo "#!/bin/sh" > test_one
9 @echo "HTREE=y" >> test_one 9 @echo "HTREE=y" >> test_one
10 @echo "QUOTA=y" >> test_one 10 @echo "QUOTA=y" >> test_one
@@ -12,8 +12,8 @@ index c130f4a..d2ade03 100644
12+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one 12+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one
13 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one 13 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
14 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one 14 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
15 @cat $(srcdir)/test_one.in >> test_one 15 @echo "DD=@DD@" >>test_one
16@@ -27,7 +27,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf 16@@ -28,7 +28,7 @@ test_one: $(srcdir)/test_one.in Makefile
17 test_script: test_one test_script.in Makefile mke2fs.conf 17 test_script: test_one test_script.in Makefile mke2fs.conf
18 @echo "Creating test_script..." 18 @echo "Creating test_script..."
19 @echo "#!/bin/sh" > test_script 19 @echo "#!/bin/sh" > test_script
@@ -22,10 +22,10 @@ index c130f4a..d2ade03 100644
22 @cat $(srcdir)/test_script.in >> test_script 22 @cat $(srcdir)/test_script.in >> test_script
23 @chmod +x test_script 23 @chmod +x test_script
24 24
25diff --git a/tests/test_config b/tests/test_config 25Index: git/tests/test_config
26index 547ef4c..e11e6f4 100644 26===================================================================
27--- a/tests/test_config 27--- git.orig/tests/test_config
28+++ b/tests/test_config 28+++ git/tests/test_config
29@@ -3,24 +3,24 @@ 29@@ -3,24 +3,24 @@
30 # 30 #
31 31
@@ -67,10 +67,10 @@ index 547ef4c..e11e6f4 100644
67 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" 67 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed"
68 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} 68 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH}
69 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} 69 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}
70diff --git a/tests/test_script.in b/tests/test_script.in 70Index: git/tests/test_script.in
71index 9959e30..442999d 100644 71===================================================================
72--- a/tests/test_script.in 72--- git.orig/tests/test_script.in
73+++ b/tests/test_script.in 73+++ git/tests/test_script.in
74@@ -39,7 +39,7 @@ for i; do 74@@ -39,7 +39,7 @@ for i; do
75 done 75 done
76 76