diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-07-03 12:11:54 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 00:22:08 +0100 |
commit | 63b40c900809153f822a7e147b048bb415a507d1 (patch) | |
tree | 739b3fa7609795ab6455d62028c33801f7cb731e /meta/recipes-devtools/e2fsprogs/e2fsprogs | |
parent | 4604255985ebdc03d159bea66ecb527b993a585e (diff) | |
download | poky-63b40c900809153f822a7e147b048bb415a507d1.tar.gz |
e2fsprogs: 1.43.8 -> 1.44.2
- Rebased Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
- Removed backport patch 0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
- The LIC_FILES_CHKSUM changed because it updated the address, others are the same
(From OE-Core rev: 2577fbed729ddc8deb7a657dbaa695d5bd7ef20d)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs')
2 files changed, 6 insertions, 46 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch deleted file mode 100644 index ff1284edc4..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From ae6603206176b771c9ed1f82569f68fc1257f014 Mon Sep 17 00:00:00 2001 | ||
2 | From: Theodore Ts'o <tytso@mit.edu> | ||
3 | Date: Wed, 3 Jan 2018 01:32:02 -0500 | ||
4 | Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian | ||
5 | systems | ||
6 | |||
7 | Addresses-Debian-Bug: #886119 | ||
8 | |||
9 | Reported-by: James Clarke <jrtc27@debian.org> | ||
10 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | ||
11 | --- | ||
12 | Upstream-Status: Backport | ||
13 | |||
14 | lib/ext2fs/swapfs.c | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c | ||
18 | index 6e5cff97..b13dc422 100644 | ||
19 | --- a/lib/ext2fs/swapfs.c | ||
20 | +++ b/lib/ext2fs/swapfs.c | ||
21 | @@ -19,6 +19,7 @@ | ||
22 | |||
23 | #include "ext2_fs.h" | ||
24 | #include "ext2fs.h" | ||
25 | +#include "ext2fsP.h" | ||
26 | #include <ext2fs/ext2_ext_attr.h> | ||
27 | |||
28 | #ifdef WORDS_BIGENDIAN | ||
29 | @@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, | ||
30 | if (inode_includes(inode_size, i_projid)) | ||
31 | t->i_projid = ext2fs_swab16(f->i_projid); | ||
32 | /* catch new static fields added after i_projid */ | ||
33 | - EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160); | ||
34 | + EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160); | ||
35 | |||
36 | i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32); | ||
37 | if (bufsize < (int) i) | ||
38 | -- | ||
39 | 2.16.1 | ||
40 | |||
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 38e1bdb3d8..d7e09b6be9 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,16 +19,16 @@ 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 | ||
22 | Index: git/misc/mke2fs.conf.in | 22 | diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in |
23 | =================================================================== | 23 | index 01e35cf..25105b3 100644 |
24 | --- git.orig/misc/mke2fs.conf.in | 24 | --- a/misc/mke2fs.conf.in |
25 | +++ git/misc/mke2fs.conf.in | 25 | +++ b/misc/mke2fs.conf.in |
26 | @@ -11,8 +11,9 @@ | 26 | @@ -11,8 +11,9 @@ |
27 | features = has_journal | 27 | features = has_journal |
28 | } | 28 | } |
29 | ext4 = { | 29 | ext4 = { |
30 | - features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize | 30 | - features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize |
31 | + features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize | 31 | + features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize |
32 | inode_size = 256 | 32 | inode_size = 256 |
33 | + auto_64-bit_support = 1 | 33 | + auto_64-bit_support = 1 |
34 | } | 34 | } |