summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-07-03 12:11:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-05 00:22:08 +0100
commit63b40c900809153f822a7e147b048bb415a507d1 (patch)
tree739b3fa7609795ab6455d62028c33801f7cb731e /meta
parent4604255985ebdc03d159bea66ecb527b993a585e (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch40
-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_1.44.2.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb)3
4 files changed, 8 insertions, 49 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 81d90a134c..a54a11c354 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,7 @@ LICENSE_e2fsprogs-mke2fs = "GPLv2"
9LICENSE_e2fsprogs-fsck = "GPLv2" 9LICENSE_e2fsprogs-fsck = "GPLv2"
10LICENSE_e2fsprogs-tune2fs = "GPLv2" 10LICENSE_e2fsprogs-tune2fs = "GPLv2"
11LICENSE_e2fsprogs-badblocks = "GPLv2" 11LICENSE_e2fsprogs-badblocks = "GPLv2"
12LIC_FILES_CHKSUM = "file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \ 12LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
13 file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \ 13 file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
14 file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \ 14 file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
15 file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \ 15 file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \
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 @@
1From ae6603206176b771c9ed1f82569f68fc1257f014 Mon Sep 17 00:00:00 2001
2From: Theodore Ts'o <tytso@mit.edu>
3Date: Wed, 3 Jan 2018 01:32:02 -0500
4Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian
5 systems
6
7Addresses-Debian-Bug: #886119
8
9Reported-by: James Clarke <jrtc27@debian.org>
10Signed-off-by: Theodore Ts'o <tytso@mit.edu>
11---
12Upstream-Status: Backport
13
14 lib/ext2fs/swapfs.c | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
18index 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--
392.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
22Index: git/misc/mke2fs.conf.in 22diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
23=================================================================== 23index 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 }
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
index 989d47394b..f2537a554e 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
@@ -6,14 +6,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \
6 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ 6 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
7 file://mkdir_p.patch \ 7 file://mkdir_p.patch \
8 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ 8 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
9 file://0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch \
10 " 9 "
11 10
12SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ 11SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
13 file://quiet-debugfs.patch \ 12 file://quiet-debugfs.patch \
14" 13"
15 14
16SRCREV = "af2eac481cf426c05ae12b946396980e16c8ab19" 15SRCREV = "7b9ea51db3be8972c7a17de25be179b18fc9fcde"
17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
18 17
19EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ 18EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \