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-04 12:27:27 +0100 |
| commit | 2577fbed729ddc8deb7a657dbaa695d5bd7ef20d (patch) | |
| tree | 61aeece67d42262c7f5ce1e02d4d5a48baa36d19 /meta/recipes-devtools/e2fsprogs/e2fsprogs | |
| parent | f63a493298de7d0cac36a65dafba5dae06c06a05 (diff) | |
| download | openembedded-core-contrib-2577fbed729ddc8deb7a657dbaa695d5bd7ef20d.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
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 @@ -From ae6603206176b771c9ed1f82569f68fc1257f014 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Wed, 3 Jan 2018 01:32:02 -0500 -Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian - systems - -Addresses-Debian-Bug: #886119 - -Reported-by: James Clarke <jrtc27@debian.org> -Signed-off-by: Theodore Ts'o <tytso@mit.edu> ---- -Upstream-Status: Backport - - lib/ext2fs/swapfs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c -index 6e5cff97..b13dc422 100644 ---- a/lib/ext2fs/swapfs.c -+++ b/lib/ext2fs/swapfs.c -@@ -19,6 +19,7 @@ - - #include "ext2_fs.h" - #include "ext2fs.h" -+#include "ext2fsP.h" - #include <ext2fs/ext2_ext_attr.h> - - #ifdef WORDS_BIGENDIAN -@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, - if (inode_includes(inode_size, i_projid)) - t->i_projid = ext2fs_swab16(f->i_projid); - /* catch new static fields added after i_projid */ -- EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160); -+ EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160); - - i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32); - if (bufsize < (int) i) --- -2.16.1 - 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> misc/mke2fs.conf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: git/misc/mke2fs.conf.in -=================================================================== ---- git.orig/misc/mke2fs.conf.in -+++ git/misc/mke2fs.conf.in +diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in +index 01e35cf..25105b3 100644 +--- a/misc/mke2fs.conf.in ++++ b/misc/mke2fs.conf.in @@ -11,8 +11,9 @@ features = has_journal } ext4 = { -- features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize -+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize +- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize ++ features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize inode_size = 256 + auto_64-bit_support = 1 } |