summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2016-03-01 14:51:50 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-03 10:49:00 +0000
commitf11de9d205961088d31f9893fd6c140b443a5841 (patch)
tree732a49fdb58f951ee28e73826d5f7204e6cde893
parentb04280ab5ff9cae40c4894767084b9306755c614 (diff)
downloadpoky-f11de9d205961088d31f9893fd6c140b443a5841.tar.gz
e2fsprogs: do not enable non-stable features by default
(From OE-Core rev: 092984669d8590627cfb188a0aa00244e22c4671) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch34
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb1
2 files changed, 35 insertions, 0 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
new file mode 100644
index 0000000000..656fb6efbd
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
@@ -0,0 +1,34 @@
1From 0a392baf1874964651115d9f77b0daa6851d1daa Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Tue, 1 Mar 2016 14:28:01 +1100
4Subject: [PATCH] Revert "mke2fs: enable the metadata_csum and 64bit features
5 by default"
6
7This reverts commit cd27af3ecb83e8fd1e3eaa14994284a1818c7c15 as we
8don't want to enable features by default that are not supported by
9the latest stable e2fsprogs release.
10
11Upstream-Status: Inappropriate [configuration]
12
13Signed-off-by: Jonathan Liu <net147@gmail.com>
14---
15 misc/mke2fs.conf.in | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
19index a049d61..106ee80 100644
20--- a/misc/mke2fs.conf.in
21+++ b/misc/mke2fs.conf.in
22@@ -11,7 +11,8 @@
23 features = has_journal
24 }
25 ext4 = {
26- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
27+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
28+ auto_64-bit_support = 1
29 inode_size = 256
30 }
31 ext4dev = {
32--
332.7.2
34
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
index d4a19f9dde..9cde8e46b7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
@@ -7,6 +7,7 @@ SRC_URI += "file://acinclude.m4 \
7 file://ptest.patch \ 7 file://ptest.patch \
8 file://mkdir.patch \ 8 file://mkdir.patch \
9 file://xattr_ordering.patch \ 9 file://xattr_ordering.patch \
10 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
10" 11"
11 12
12SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544" 13SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544"