summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2018-01-24 11:01:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-30 11:50:11 +0000
commit4b4ca19f6d030c509be79d7e62352957cd360610 (patch)
tree343c72662098d84a96fae99825e497c64644c72b /meta/recipes-devtools/e2fsprogs/e2fsprogs
parent6a24a0ba7c334c1b9ca4b8812dbd79fc899d3a8f (diff)
downloadpoky-4b4ca19f6d030c509be79d7e62352957cd360610.tar.gz
e2fsprogs: 1.43.7 -> 1.43.8
Upgrade e2fsprogs from 1.43.7 to 1.43.8. Backport patch to fix build on BE systems (From OE-Core rev: 6c7f32bd8b27c4dd91c1ac20f091358982e9c275) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs')
-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/e2fsprogs-fix-missing-check-for-permission-denied.patch10
2 files changed, 47 insertions, 3 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
new file mode 100644
index 0000000000..ff1284edc4
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
@@ -0,0 +1,40 @@
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/e2fsprogs-fix-missing-check-for-permission-denied.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
index 33054c61fa..69c09bc1d7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
@@ -1,3 +1,6 @@
1From c7914309aeee6209ddb6995c084805a911d9cc82 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 10 Aug 2016 11:19:44 +0800
1Subject: [PATCH] Fix missing check for permission denied. 4Subject: [PATCH] Fix missing check for permission denied.
2 5
3If the path to "ROOT_SYSCONFDIR/mke2fs.conf" has a permission denied problem, 6If the path to "ROOT_SYSCONFDIR/mke2fs.conf" has a permission denied problem,
@@ -10,15 +13,16 @@ Upstream-Status: Pending
10Written-by: Henrik Wallin <henrik.b.wallin@ericsson.com> 13Written-by: Henrik Wallin <henrik.b.wallin@ericsson.com>
11 14
12Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 15Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
16
13--- 17---
14 lib/support/profile.c | 2 +- 18 lib/support/profile.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
16 20
17diff --git a/lib/support/profile.c b/lib/support/profile.c 21diff --git a/lib/support/profile.c b/lib/support/profile.c
18index 51a3314..1c1039f 100644 22index 9e96673b..32d83002 100644
19--- a/lib/support/profile.c 23--- a/lib/support/profile.c
20+++ b/lib/support/profile.c 24+++ b/lib/support/profile.c
21@@ -335,7 +335,7 @@ profile_init(const char **files, profile_t *ret_profile) 25@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile)
22 *last = new_file; 26 *last = new_file;
23 last = &new_file->next; 27 last = &new_file->next;
24 } 28 }
@@ -28,5 +32,5 @@ index 51a3314..1c1039f 100644
28 goto errout; 32 goto errout;
29 33
30-- 34--
312.7.4 352.16.1
32 36