diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2016-06-21 23:22:42 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-01 16:08:16 +0100 |
| commit | a96ad733cf80716e26882889a130c87a78e5f576 (patch) | |
| tree | daa06074f986a3e62c2b393db861defcd07efc6b | |
| parent | 646c366c2566bd8dd6f73681cea9f5b021589a56 (diff) | |
| download | openembedded-core-a96ad733cf80716e26882889a130c87a78e5f576.tar.gz openembedded-core-a96ad733cf80716e26882889a130c87a78e5f576.tar.bz2 openembedded-core-a96ad733cf80716e26882889a130c87a78e5f576.zip | |
e2fsprogs: tweak mke2fs ext4 features
While e2fsprogs upgraded to 1.43, it dropped the patch
Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch,
we get it back and rebase for 1.43 to fix invoking grub-probe
failed.
Without the fix:
...
root@localhost:~# mkfs.ext4 /dev/sda3
[skip]
root@localhost:~# grub-probe --target=fs -d /dev/sda3
grub-probe: error: unknown filesystem.
...
After apply the fix:
...
root@localhost:~# mkfs.ext4 /dev/sda3
[skip]
root@localhost:~# grub-probe --target=fs -d /dev/sda3
ext2
...
Signed-off-by: Hongxu Jia <hongxu.jia@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.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb | 1 |
2 files changed, 40 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..e66cd4d1a7 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch @@ -0,0 +1,39 @@ +From 0a392baf1874964651115d9f77b0daa6851d1daa Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Tue, 1 Mar 2016 14:28:01 +1100 +Subject: [PATCH] Revert "mke2fs: enable the metadata_csum and 64bit features + by default" + +This reverts commit cd27af3ecb83e8fd1e3eaa14994284a1818c7c15 as we +don't want to enable features by default that are not supported by +the latest stable e2fsprogs release. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Jonathan Liu <net147@gmail.com> + +Rebase to 1.43: +The upstream has disabled metadata_csum by default +this rebase just revert 64bit feature. +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + misc/mke2fs.conf.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in +index 78fe50a..6f1940e 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,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 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb index aa1cbce93b..e82124bf58 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb @@ -8,6 +8,7 @@ SRC_URI += "file://acinclude.m4 \ file://run-ptest \ file://ptest.patch \ file://mkdir.patch \ + file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ " SRCREV = "d6adf070b0e85f209c0d7f310188b134b5cb7180" |