diff options
author | Ross Burton <ross@burtonini.com> | 2021-08-09 16:36:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-18 18:00:19 +0100 |
commit | 0ca4b9916259cfb83f331fbaf062086bbaec64a5 (patch) | |
tree | ade6c972020149048d0a7de40a815618634a4aac | |
parent | f9cb0aec9c3e4b601d44cc9ddd8c59edb5494678 (diff) | |
download | poky-0ca4b9916259cfb83f331fbaf062086bbaec64a5.tar.gz |
e2fsprogs: ensure small images have 256-byte inodes
e2fsprogs calls filesystems larger than 3MB but smaller than 512MB
"small", which has some implications:
- blocksize 1024 instead of 4096
- inode_ratio 4096 instead of 16384
- inode_size 128 instead of 256
The outcome of the inode size dropping to 128 bytes is that they cannot
store 64-bit timestamps, so are not Y2038-safe.
A previous attempt to solve this problem[1] changed some of the canned
wic files to pass -T default to mkfs.ext4, but this only covered wic
images and not traditional images. Also, actually small filesystems,
for example a core-image-minimal, will happily be tens of megabytes and
with the "default" options will result in an image which runs out of
blocks before it runs out of space:
mkfs.ext4: Could not allocate block in ext2 filesystem while populating file system
Considering that many OpenEmbedded images are in fact "small", being
2038-safe is worth the marginal increase is disk usage. This patch
alters the small configuration in native builds so that it also has
256-byte inodes. Target is unchanged so that standard behaviour is
maintained outside of the build.
This is actually the same underlying patch that Mathieu Dubois-Briand
sent in April, but the wic change in [1] was accepted instead. I believe
that is the wrong approach and this approach covers more cases.
[ YOCTO #14478 ]
[1] openembedded-core eecbe62
[2] https://lists.openembedded.org/g/openembedded-core/message/150298
(From OE-Core rev: 98fbb9452aa762e61032a0836e5d732f206e3836)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9ab0ae83a24ee99e69f8ac54256b253a122aef8a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/big-inodes-for-small-fs.patch | 22 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/big-inodes-for-small-fs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/big-inodes-for-small-fs.patch new file mode 100644 index 0000000000..caeb560d32 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/big-inodes-for-small-fs.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Ensure "small" file systems also have the default inode size (256 bytes) so that | ||
2 | can store 64-bit timestamps and work past 2038. | ||
3 | |||
4 | The "small" type is any size >3MB and <512MB, which covers a lot of relatively | ||
5 | small filesystems built by OE, especially when they're sized to fit the contents | ||
6 | and expand to the storage on boot. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
10 | |||
11 | diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in | ||
12 | index 01e35cf8..29f41dc0 100644 | ||
13 | --- a/misc/mke2fs.conf.in | ||
14 | +++ b/misc/mke2fs.conf.in | ||
15 | @@ -16,7 +16,6 @@ | ||
16 | } | ||
17 | small = { | ||
18 | blocksize = 1024 | ||
19 | - inode_size = 128 | ||
20 | inode_ratio = 4096 | ||
21 | } | ||
22 | floppy = { | ||
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb index 439928e433..2eae9cd892 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | |||
@@ -14,6 +14,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ | |||
14 | 14 | ||
15 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ | 15 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ |
16 | file://quiet-debugfs.patch \ | 16 | file://quiet-debugfs.patch \ |
17 | file://big-inodes-for-small-fs.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" | 20 | SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" |