diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-03-09 20:55:46 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:25:20 -0700 |
| commit | 6a83aca280fece30fd7c17f32f07f592f6300c6c (patch) | |
| tree | 4e3129e17cfe2c1fbf23ab74167f74994331f5ae /meta/recipes-devtools | |
| parent | 325e516b59e677dc8e2c5756589fa8037b3e9392 (diff) | |
| download | openembedded-core-contrib-6a83aca280fece30fd7c17f32f07f592f6300c6c.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.
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>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 30 |
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> misc/mke2fs.conf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in -index 812f7c7..0280398 100644 ---- a/misc/mke2fs.conf.in -+++ b/misc/mke2fs.conf.in +Index: git/misc/mke2fs.conf.in +=================================================================== +--- git.orig/misc/mke2fs.conf.in ++++ git/misc/mke2fs.conf.in @@ -11,8 +11,9 @@ features = has_journal } @@ -32,5 +32,5 @@ index 812f7c7..0280398 100644 inode_size = 256 + auto_64-bit_support = 1 } - ext4dev = { - features = has_journal,extent,huge_file,flex_bg,uninit_bg,inline_data,64bit,dir_nlink,extra_isize + small = { + 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 @@ Upstream-Status: Inappropriate -diff --git a/tests/Makefile.in b/tests/Makefile.in -index c130f4a..d2ade03 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf +Index: git/tests/Makefile.in +=================================================================== +--- git.orig/tests/Makefile.in ++++ git/tests/Makefile.in +@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile @echo "#!/bin/sh" > test_one @echo "HTREE=y" >> test_one @echo "QUOTA=y" >> test_one @@ -12,8 +12,8 @@ index c130f4a..d2ade03 100644 + @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one - @cat $(srcdir)/test_one.in >> test_one -@@ -27,7 +27,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf + @echo "DD=@DD@" >>test_one +@@ -28,7 +28,7 @@ test_one: $(srcdir)/test_one.in Makefile test_script: test_one test_script.in Makefile mke2fs.conf @echo "Creating test_script..." @echo "#!/bin/sh" > test_script @@ -22,10 +22,10 @@ index c130f4a..d2ade03 100644 @cat $(srcdir)/test_script.in >> test_script @chmod +x test_script -diff --git a/tests/test_config b/tests/test_config -index 547ef4c..e11e6f4 100644 ---- a/tests/test_config -+++ b/tests/test_config +Index: git/tests/test_config +=================================================================== +--- git.orig/tests/test_config ++++ git/tests/test_config @@ -3,24 +3,24 @@ # @@ -67,10 +67,10 @@ index 547ef4c..e11e6f4 100644 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} -diff --git a/tests/test_script.in b/tests/test_script.in -index 9959e30..442999d 100644 ---- a/tests/test_script.in -+++ b/tests/test_script.in +Index: git/tests/test_script.in +=================================================================== +--- git.orig/tests/test_script.in ++++ git/tests/test_script.in @@ -39,7 +39,7 @@ for i; do done |