mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
4604255985
commit
63b40c9008
@@ -9,7 +9,7 @@ LICENSE_e2fsprogs-mke2fs = "GPLv2"
|
||||
LICENSE_e2fsprogs-fsck = "GPLv2"
|
||||
LICENSE_e2fsprogs-tune2fs = "GPLv2"
|
||||
LICENSE_e2fsprogs-badblocks = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
|
||||
LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
|
||||
file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
|
||||
file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
|
||||
file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \
|
||||
|
||||
-40
@@ -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
|
||||
|
||||
+6
-6
@@ -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
|
||||
}
|
||||
|
||||
+1
-2
@@ -6,14 +6,13 @@ 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 \
|
||||
file://quiet-debugfs.patch \
|
||||
"
|
||||
|
||||
SRCREV = "af2eac481cf426c05ae12b946396980e16c8ab19"
|
||||
SRCREV = "7b9ea51db3be8972c7a17de25be179b18fc9fcde"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
|
||||
|
||||
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
|
||||
Reference in New Issue
Block a user