mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

e2fsprogs: 1.43.7 -> 1.43.8

Browse Source 
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>
This commit is contained in:
Huang Qiyu
2018-01-24 11:01:37 +08:00
committed by Richard Purdie
parent 6a24a0ba7c
commit 4b4ca19f6d
3 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch Normal file
View File

@@ -0,0 +1,40 @@
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

10
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
View File

@@ -1,3 +1,6 @@
From c7914309aeee6209ddb6995c084805a911d9cc82 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 10 Aug 2016 11:19:44 +0800
Subject: [PATCH] Fix missing check for permission denied.
If the path to "ROOT_SYSCONFDIR/mke2fs.conf" has a permission denied problem,
@@ -10,15 +13,16 @@ Upstream-Status: Pending
Written-by: Henrik Wallin <henrik.b.wallin@ericsson.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
lib/support/profile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/support/profile.c b/lib/support/profile.c
index 51a3314..1c1039f 100644
index 9e96673b..32d83002 100644
--- a/lib/support/profile.c
+++ b/lib/support/profile.c
@@ -335,7 +335,7 @@ profile_init(const char **files, profile_t *ret_profile)
@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile)
*last = new_file;
last = &new_file->next;
}
@@ -28,5 +32,5 @@ index 51a3314..1c1039f 100644
goto errout;
--
2.7.4
2.16.1

5
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.7.bb → meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
View File

@@ -7,11 +7,12 @@ SRC_URI += "file://remove.ldconfig.call.patch \
file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
file://mkdir_p.patch \
file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
"
file://0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch \
"
SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch"
SRCREV = "4c5e6cd6defb83f1b35a5ef6fccd68c86874ee06"
SRCREV = "af2eac481cf426c05ae12b946396980e16c8ab19"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \