diff options
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch | 9 | ||||
-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> | |||
20 | 1 file changed, 2 insertions(+), 1 deletion(-) | 20 | 1 file changed, 2 insertions(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in | 22 | diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in |
23 | index 78fe50a..6f1940e 100644 | 23 | index 812f7c7..0280398 100644 |
24 | --- a/misc/mke2fs.conf.in | 24 | --- a/misc/mke2fs.conf.in |
25 | +++ b/misc/mke2fs.conf.in | 25 | +++ b/misc/mke2fs.conf.in |
26 | @@ -11,8 +11,9 @@ | 26 | @@ -11,8 +11,9 @@ |
27 | features = has_journal | 27 | features = has_journal |
28 | } | 28 | } |
29 | ext4 = { | 29 | ext4 = { |
30 | - features = has_journal,extent,huge_file,flex_bg,64bit,dir_nlink,extra_isize | 30 | - features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize |
31 | + features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize | 31 | + features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize |
32 | inode_size = 256 | 32 | inode_size = 256 |
33 | + auto_64-bit_support = 1 | 33 | + auto_64-bit_support = 1 |
34 | } | 34 | } |
35 | ext4dev = { | 35 | ext4dev = { |
36 | features = has_journal,extent,huge_file,flex_bg,inline_data,64bit,dir_nlink,extra_isize | 36 | features = has_journal,extent,huge_file,flex_bg,uninit_bg,inline_data,64bit,dir_nlink,extra_isize |
37 | -- | ||
38 | 2.8.1 | ||
39 | |||
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 @@ | |||
1 | require e2fsprogs.inc | 1 | require e2fsprogs.inc |
2 | 2 | ||
3 | PR = "r1" | ||
4 | |||
5 | SRC_URI += "file://acinclude.m4 \ | 3 | SRC_URI += "file://acinclude.m4 \ |
6 | file://remove.ldconfig.call.patch \ | 4 | file://remove.ldconfig.call.patch \ |
7 | file://quiet-debugfs.patch \ | 5 | file://quiet-debugfs.patch \ |
@@ -13,7 +11,7 @@ SRC_URI += "file://acinclude.m4 \ | |||
13 | 11 | ||
14 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" | 12 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" |
15 | 13 | ||
16 | SRCREV = "4e52870eeb08ed7532bf4fd3d5cb1538f714bdc8" | 14 | SRCREV = "3d66c4b20f09f923078c1e6eb9b549865b549674" |
17 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" |
18 | 16 | ||
19 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ | 17 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ |
@@ -60,7 +58,7 @@ do_install () { | |||
60 | 58 | ||
61 | # Need to find the right mke2fs.conf file | 59 | # Need to find the right mke2fs.conf file |
62 | e2fsprogs_conf_fixup () { | 60 | e2fsprogs_conf_fixup () { |
63 | for i in mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.ext4dev; do | 61 | for i in mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4; do |
64 | create_wrapper ${D}${base_sbindir}/$i MKE2FS_CONFIG=${sysconfdir}/mke2fs.conf | 62 | create_wrapper ${D}${base_sbindir}/$i MKE2FS_CONFIG=${sysconfdir}/mke2fs.conf |
65 | done | 63 | done |
66 | } | 64 | } |