aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-02-09 19:23:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:31 -0800
commit54a012bff9430a8e973ddef61d14ac10d9ec9ed3 (patch)
tree2459d2fe67c95136fa1a6141e4f16fa9e62af6ba
parentb9035db1c6915020a394c455f8dab48936aa851a (diff)
downloadopenembedded-core-contrib-54a012bff9430a8e973ddef61d14ac10d9ec9ed3.tar.gz
e2fsprogs: 1.43.3 -> 1.43.4
* Rebased Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch. * The mkfs.ext4dev is gone. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch9
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.3.bb)6
2 files changed, 5 insertions, 10 deletions
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 e66cd4d1a7..38fb07e6e6 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
@@ -20,20 +20,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
-index 78fe50a..6f1940e 100644
+index 812f7c7..0280398 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,64bit,dir_nlink,extra_isize
+- 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
inode_size = 256
+ auto_64-bit_support = 1
}
ext4dev = {
- features = has_journal,extent,huge_file,flex_bg,inline_data,64bit,dir_nlink,extra_isize
---
-2.8.1
-
+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,inline_data,64bit,dir_nlink,extra_isize
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.3.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
index ac4589c7c4..4b06b189b0 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.3.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
@@ -1,7 +1,5 @@
require e2fsprogs.inc
-PR = "r1"
-
SRC_URI += "file://acinclude.m4 \
file://remove.ldconfig.call.patch \
file://quiet-debugfs.patch \
@@ -13,7 +11,7 @@ SRC_URI += "file://acinclude.m4 \
SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch"
-SRCREV = "4e52870eeb08ed7532bf4fd3d5cb1538f714bdc8"
+SRCREV = "3d66c4b20f09f923078c1e6eb9b549865b549674"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
@@ -60,7 +58,7 @@ do_install () {
# Need to find the right mke2fs.conf file
e2fsprogs_conf_fixup () {
- for i in mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.ext4dev; do
+ for i in mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4; do
create_wrapper ${D}${base_sbindir}/$i MKE2FS_CONFIG=${sysconfdir}/mke2fs.conf
done
}