summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-14 12:48:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-16 13:53:16 +0100
commitd46a59b21d2db9ad8b4962a9bab839db1179565e (patch)
treea1069bc2e85dd0e72ec77a4b8af031b3c36c981f
parent1903478fe4e2fb1b31d8f97dde8e7ebd9f4d9403 (diff)
downloadpoky-d46a59b21d2db9ad8b4962a9bab839db1179565e.tar.gz
e2fsprogs: Remove patch that disabled 64bit for ext4 by default
OE no longer ships a git snapshot of e2fsprogs, so use the new upstream default now. (From OE-Core rev: f5edce401cfb31ebd0200adaba9a201caf7ea705) Signed-off-by: Adrian Bunk <bunk@stusta.de> 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.patch36
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb1
2 files changed, 0 insertions, 37 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
deleted file mode 100644
index d7e09b6be9..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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]
12Signed-off-by: Jonathan Liu <net147@gmail.com>
13
14Rebase to 1.43:
15The upstream has disabled metadata_csum by default
16this rebase just revert 64bit feature.
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18---
19 misc/mke2fs.conf.in | 3 ++-
20 1 file changed, 2 insertions(+), 1 deletion(-)
21
22diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
23index 01e35cf..25105b3 100644
24--- a/misc/mke2fs.conf.in
25+++ b/misc/mke2fs.conf.in
26@@ -11,8 +11,9 @@
27 features = has_journal
28 }
29 ext4 = {
30- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
31+ features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize
32 inode_size = 256
33+ auto_64-bit_support = 1
34 }
35 small = {
36 blocksize = 1024
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
index ed946159bd..5cda89f59f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
@@ -3,7 +3,6 @@ require e2fsprogs.inc
3SRC_URI += "file://remove.ldconfig.call.patch \ 3SRC_URI += "file://remove.ldconfig.call.patch \
4 file://run-ptest \ 4 file://run-ptest \
5 file://ptest.patch \ 5 file://ptest.patch \
6 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
7 file://mkdir_p.patch \ 6 file://mkdir_p.patch \
8 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ 7 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
9 file://0001-create_inode-fix-copying-large-files.patch \ 8 file://0001-create_inode-fix-copying-large-files.patch \