diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-08-08 11:45:13 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-12 16:23:57 +0100 |
commit | 9983b07fffd19082abded7c3f15cc77d306dd69c (patch) | |
tree | b5674c575307f216aa2b24ad3bd48ecf741ca5c5 | |
parent | 0928c098ac631ffefa7fd14013716a99c9c6657b (diff) | |
download | poky-9983b07fffd19082abded7c3f15cc77d306dd69c.tar.gz |
e2fsprogs: 1.44.5 -> 1.45.3
Update e2fsprogs from 1.44.5 to 1.45.3:
* rebase ptest.patch
* remove 0001-create_inode-fix-copying-large-files.patch which merged by upstream
* add new sub-package e2fsprogs-e2scrub and disable cron support
(From OE-Core rev: e5f8c1facfc3507710d7111951fe075e01c58e4e)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch | 50 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.3.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb) | 10 |
3 files changed, 14 insertions, 79 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch deleted file mode 100644 index c89581dce8..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 674ab87b8338372338d20e21a350f88b4ff6c7c8 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Fri, 1 Feb 2019 10:59:59 +0000 | ||
7 | Subject: [PATCH] create_inode: fix copying large files | ||
8 | |||
9 | When copying large files into a ext filesystem at mkfs time the copy fails at | ||
10 | 2^31 bytes in. There are two problems: | ||
11 | |||
12 | copy_file_chunk() passes an offset (off_t, 64-bit typically) to | ||
13 | ext2fs_file_lseek() which expects a ext2_off_t (typedef to __u32) so the value | ||
14 | is truncated. Solve by calling ext2fs_file_llseek() which takes a u64 offset | ||
15 | instead. | ||
16 | |||
17 | try_lseek_copy() rounds the data and hole offsets as found by lseek() to block | ||
18 | boundaries, but the calculation gets truncated to 32-bits. Solve by casting the | ||
19 | 32-bit blocksize to off_t to ensure this doesn't happen. | ||
20 | |||
21 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
22 | --- | ||
23 | misc/create_inode.c | 4 ++-- | ||
24 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/misc/create_inode.c b/misc/create_inode.c | ||
27 | index 05aa6363..f106dcda 100644 | ||
28 | --- a/misc/create_inode.c | ||
29 | +++ b/misc/create_inode.c | ||
30 | @@ -438,7 +438,7 @@ static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, | ||
31 | ptr += blen; | ||
32 | continue; | ||
33 | } | ||
34 | - err = ext2fs_file_lseek(e2_file, off + bpos, | ||
35 | + err = ext2fs_file_llseek(e2_file, off + bpos, | ||
36 | EXT2_SEEK_SET, NULL); | ||
37 | if (err) | ||
38 | goto fail; | ||
39 | @@ -481,7 +481,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, | ||
40 | return EXT2_ET_UNIMPLEMENTED; | ||
41 | |||
42 | data_blk = data & ~(fs->blocksize - 1); | ||
43 | - hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); | ||
44 | + hole_blk = (hole + (off_t)(fs->blocksize - 1)) & ~(off_t)(fs->blocksize - 1); | ||
45 | err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, | ||
46 | zerobuf); | ||
47 | if (err) | ||
48 | -- | ||
49 | 2.11.0 | ||
50 | |||
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch index 4e6b6292e1..c3e46ce65f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | |||
@@ -5,11 +5,13 @@ Subject: [PATCH] e2fsprogs: add ptest | |||
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Rebase for e2fsprogs 1.45.3. | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | --- | 11 | --- |
9 | tests/Makefile.in | 4 ++-- | 12 | tests/Makefile.in | 4 ++-- |
10 | tests/test_config | 32 ++++++++++++++++---------------- | 13 | tests/test_config | 32 ++++++++++++++++---------------- |
11 | tests/test_script.in | 2 +- | 14 | 2 files changed, 18 insertions(+), 18 deletions(-) |
12 | 3 files changed, 19 insertions(+), 19 deletions(-) | ||
13 | 15 | ||
14 | diff --git a/tests/Makefile.in b/tests/Makefile.in | 16 | diff --git a/tests/Makefile.in b/tests/Makefile.in |
15 | index 8c4d2048..e021af32 100644 | 17 | index 8c4d2048..e021af32 100644 |
@@ -34,10 +36,10 @@ index 8c4d2048..e021af32 100644 | |||
34 | @chmod +x-w test_script | 36 | @chmod +x-w test_script |
35 | 37 | ||
36 | diff --git a/tests/test_config b/tests/test_config | 38 | diff --git a/tests/test_config b/tests/test_config |
37 | index 1f146ca2..05125f9c 100644 | 39 | index 9dc762ce..a5fbdef6 100644 |
38 | --- a/tests/test_config | 40 | --- a/tests/test_config |
39 | +++ b/tests/test_config | 41 | +++ b/tests/test_config |
40 | @@ -3,16 +3,16 @@ | 42 | @@ -3,25 +3,25 @@ |
41 | # | 43 | # |
42 | 44 | ||
43 | unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER | 45 | unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER |
@@ -62,12 +64,6 @@ index 1f146ca2..05125f9c 100644 | |||
62 | +DEBUGFS="$USE_VALGRIND debugfs" | 64 | +DEBUGFS="$USE_VALGRIND debugfs" |
63 | +DEBUGFS_EXE="/sbin/debugfs" | 65 | +DEBUGFS_EXE="/sbin/debugfs" |
64 | TEST_BITS="test_data.tmp" | 66 | TEST_BITS="test_data.tmp" |
65 | if [ ! -s $TEST_BITS ]; then | ||
66 | # create a non-sparse test file if possible, since debugfs may be | ||
67 | @@ -21,14 +21,14 @@ if [ ! -s $TEST_BITS ]; then | ||
68 | dd if=/dev/urandom of=$TEST_BITS bs=128k count=1 > /dev/null 2>&1 || | ||
69 | TEST_BITS="$DEFBUGFS_EXE" | ||
70 | fi | ||
71 | -RESIZE2FS_EXE="../resize/resize2fs" | 67 | -RESIZE2FS_EXE="../resize/resize2fs" |
72 | +RESIZE2FS_EXE="/sbin/resize2fs" | 68 | +RESIZE2FS_EXE="/sbin/resize2fs" |
73 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" | 69 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" |
@@ -85,16 +81,3 @@ index 1f146ca2..05125f9c 100644 | |||
85 | CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" | 81 | CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" |
86 | LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} | 82 | LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} |
87 | DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} | 83 | DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} |
88 | diff --git a/tests/test_script.in b/tests/test_script.in | ||
89 | index 9959e308..442999db 100644 | ||
90 | --- a/tests/test_script.in | ||
91 | +++ b/tests/test_script.in | ||
92 | @@ -39,7 +39,7 @@ for i; do | ||
93 | done | ||
94 | |||
95 | if test "$TESTS"x = x ; then | ||
96 | - if test -n "DO_FAILED"; then | ||
97 | + if test -n "$DO_FAILED"; then | ||
98 | exit 0 | ||
99 | fi | ||
100 | TESTS=`ls -d $SRCDIR/[a-zA-Z]_*` | ||
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.3.bb index 5cda89f59f..fdc9454b58 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.3.bb | |||
@@ -5,19 +5,19 @@ SRC_URI += "file://remove.ldconfig.call.patch \ | |||
5 | file://ptest.patch \ | 5 | file://ptest.patch \ |
6 | file://mkdir_p.patch \ | 6 | file://mkdir_p.patch \ |
7 | file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ | 7 | file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ |
8 | file://0001-create_inode-fix-copying-large-files.patch \ | ||
9 | " | 8 | " |
10 | 9 | ||
11 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ | 10 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ |
12 | file://quiet-debugfs.patch \ | 11 | file://quiet-debugfs.patch \ |
13 | " | 12 | " |
14 | 13 | ||
15 | SRCREV = "9a03c07e00f09a772245281d84a284c67e905148" | 14 | SRCREV = "1f56fb81236fe3e25e2c60c1e89ea0aa7cb36260" |
16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" |
17 | 16 | ||
18 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ | 17 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ |
19 | --enable-elf-shlibs --disable-libuuid --disable-uuidd \ | 18 | --enable-elf-shlibs --disable-libuuid --disable-uuidd \ |
20 | --disable-libblkid --enable-verbose-makecmds" | 19 | --disable-libblkid --enable-verbose-makecmds \ |
20 | --with-crond-dir=no" | ||
21 | 21 | ||
22 | EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" | 22 | EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" |
23 | 23 | ||
@@ -83,11 +83,12 @@ do_install_append_class-target() { | |||
83 | RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" | 83 | RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" |
84 | RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" | 84 | RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" |
85 | 85 | ||
86 | PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" | 86 | PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-e2scrub e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" |
87 | PACKAGES =+ "libcomerr libss libe2p libext2fs" | 87 | PACKAGES =+ "libcomerr libss libe2p libext2fs" |
88 | 88 | ||
89 | FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" | 89 | FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" |
90 | FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" | 90 | FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" |
91 | FILES_e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*" | ||
91 | FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" | 92 | FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" |
92 | FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label" | 93 | FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label" |
93 | FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" | 94 | FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" |
@@ -112,6 +113,7 @@ ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2" | |||
112 | ALTERNATIVE_${PN}-tune2fs = "tune2fs" | 113 | ALTERNATIVE_${PN}-tune2fs = "tune2fs" |
113 | ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs" | 114 | ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs" |
114 | 115 | ||
116 | RDEPENDS_e2fsprogs-e2scrub = "bash" | ||
115 | RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed" | 117 | RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed" |
116 | RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" | 118 | RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" |
117 | 119 | ||