summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch24
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch48
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch69
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/big-inodes-for-small-fs.patch22
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch4
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.4.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb)7
7 files changed, 74 insertions, 102 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch
deleted file mode 100644
index 26f972b313..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 42ba67f9a51ef959e7fd8dac29b5398c121c6976 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Apr 2021 23:45:56 +0200
4Subject: [PATCH] lib/ext2fs/unix_io.c: do unlock on error
5
6Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/68]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 lib/ext2fs/unix_io.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
13index 64eee342..528c2fbc 100644
14--- a/lib/ext2fs/unix_io.c
15+++ b/lib/ext2fs/unix_io.c
16@@ -398,7 +398,7 @@ static errcode_t raw_write_blk(io_channel channel,
17 mutex_lock(data, BOUNCE_MTX);
18 if (ext2fs_llseek(data->dev, location, SEEK_SET) < 0) {
19 retval = errno ? errno : EXT2_ET_LLSEEK_FAILED;
20- goto error_out;
21+ goto error_unlock;
22 }
23 actual = write(data->dev, buf, size);
24 mutex_unlock(data, BOUNCE_MTX);
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch
deleted file mode 100644
index 2452f7e08e..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 3593063f735f453d43f461292e26913436c11ca3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sat, 1 May 2021 13:06:12 +0200
4Subject: [PATCH] lib/ext2fs/unix_io.c: revert parts of "libext2fs: fix
5 potential races in unix_io"
6
7Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/68]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 lib/ext2fs/unix_io.c | 15 ++++++++-------
11 1 file changed, 8 insertions(+), 7 deletions(-)
12
13diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
14index 528c2fbc..f4916b21 100644
15--- a/lib/ext2fs/unix_io.c
16+++ b/lib/ext2fs/unix_io.c
17@@ -311,10 +311,10 @@ bounce_read:
18 size += really_read;
19 goto short_read;
20 }
21- actual = size;
22- if (actual > align_size)
23- actual = align_size;
24- actual -= offset;
25+ if ((actual + offset) > align_size)
26+ actual = align_size - offset;
27+ if (actual > size)
28+ actual = size;
29 memcpy(buf, data->bounce + offset, actual);
30
31 really_read += actual;
32@@ -455,9 +455,10 @@ bounce_write:
33 }
34 }
35 actual = size;
36- if (actual > align_size)
37- actual = align_size;
38- actual -= offset;
39+ if ((actual + offset) > align_size)
40+ actual = align_size - offset;
41+ if (actual > size)
42+ actual = size;
43 memcpy(((char *)data->bounce) + offset, buf, actual);
44 if (ext2fs_llseek(data->dev, aligned_blk * align_size, SEEK_SET) < 0) {
45 retval = errno ? errno : EXT2_ET_LLSEEK_FAILED;
46--
472.24.0
48
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
new file mode 100644
index 0000000000..f198df83eb
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
@@ -0,0 +1,69 @@
1From ea5adf259e01c790f9ba69d6fe88d691de410b6f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 22 Aug 2021 14:37:32 +0200
4Subject: [PATCH] tests/u_direct_io/expect: correct expected output
5
6This is likely the right fix, but upstream needs to confirm.
7
8Upstream-Status: Inappropriate [issue reported https://github.com/tytso/e2fsprogs/issues/80]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 tests/u_direct_io/expect | 16 +++++++++-------
12 1 file changed, 9 insertions(+), 7 deletions(-)
13
14diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
15index b0cdc730..830cbd75 100644
16--- a/tests/u_direct_io/expect
17+++ b/tests/u_direct_io/expect
18@@ -19,8 +19,8 @@ Filesystem OS type: Linux
19 Inode count: 32768
20 Block count: 32768
21 Reserved block count: 1638
22-Overhead clusters: 5131
23-Free blocks: 27631
24+Overhead clusters: 6155
25+Free blocks: 26607
26 Free inodes: 32757
27 First block: 0
28 Block size: 4096
29@@ -29,27 +29,29 @@ Reserved GDT blocks: 7
30 Blocks per group: 32768
31 Fragments per group: 32768
32 Inodes per group: 32768
33-Inode blocks per group: 1024
34+Inode blocks per group: 2048
35 Flex block group size: 16
36 Mount count: 0
37 Check interval: 15552000 (6 months)
38 Reserved blocks uid: 0
39 Reserved blocks gid: 0
40 First inode: 11
41-Inode size: 128
42+Inode size: 256
43+Required extra isize: 32
44+Desired extra isize: 32
45 Journal inode: 8
46 Default directory hash: half_md4
47 Journal backup: inode blocks
48 Directories: 2
49 Group 0: block bitmap at 9, inode bitmap at 25, inode table at 41
50- 27631 free blocks, 32757 free inodes, 2 used directories
51+ 26607 free blocks, 32757 free inodes, 2 used directories
52 e2fsck -fn -N test_filesys $LOOP
53 Pass 1: Checking inodes, blocks, and sizes
54 Pass 2: Checking directory structure
55 Pass 3: Checking directory connectivity
56 Pass 4: Checking reference counts
57 Pass 5: Checking group summary information
58-test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks
59+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks
60 Exit status is 0
61 e2fsck -fn -N test_filesys $TMPFILE
62 Pass 1: Checking inodes, blocks, and sizes
63@@ -57,5 +59,5 @@ Pass 2: Checking directory structure
64 Pass 3: Checking directory connectivity
65 Pass 4: Checking reference counts
66 Pass 5: Checking group summary information
67-test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks
68+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks
69 Exit status is 0
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
deleted file mode 100644
index caeb560d32..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/big-inodes-for-small-fs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Ensure "small" file systems also have the default inode size (256 bytes) so that
2can store 64-bit timestamps and work past 2038.
3
4The "small" type is any size >3MB and <512MB, which covers a lot of relatively
5small filesystems built by OE, especially when they're sized to fit the contents
6and expand to the storage on boot.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@arm.com>
10
11diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
12index 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/e2fsprogs-fix-missing-check-for-permission-denied.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
index e8b2aafbf3..a4f98246bb 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
@@ -1,4 +1,4 @@
1From 8957443bcbea43685c76eb3cbc5009f7fd529283 Mon Sep 17 00:00:00 2001 1From f1e161a48f74b46ae3c99921971c4b5ae8d587c9 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 10 Aug 2016 11:19:44 +0800 3Date: Wed, 10 Aug 2016 11:19:44 +0800
4Subject: [PATCH] Fix missing check for permission denied. 4Subject: [PATCH] Fix missing check for permission denied.
@@ -19,7 +19,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/lib/support/profile.c b/lib/support/profile.c 21diff --git a/lib/support/profile.c b/lib/support/profile.c
22index 585ed595..810dd66b 100644 22index f54739e7..53ea68f1 100644
23--- a/lib/support/profile.c 23--- a/lib/support/profile.c
24+++ b/lib/support/profile.c 24+++ b/lib/support/profile.c
25@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile) 25@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
index 96eb7f20df..41a4047622 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
@@ -1,4 +1,4 @@
1From 3b75308cc75adc249db6ca36e42fe93309b9a018 Mon Sep 17 00:00:00 2001 1From 550b5fbece84dde16ce9910c2cad390ea4a2f5d5 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 23 Dec 2013 13:38:34 +0000 3Date: Mon, 23 Dec 2013 13:38:34 +0000
4Subject: [PATCH] e2fsprogs: silence debugfs 4Subject: [PATCH] e2fsprogs: silence debugfs
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.4.bb
index 8cc046c794..f42cefcaf9 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.4.bb
@@ -4,17 +4,14 @@ SRC_URI += "file://remove.ldconfig.call.patch \
4 file://run-ptest \ 4 file://run-ptest \
5 file://ptest.patch \ 5 file://ptest.patch \
6 file://mkdir_p.patch \ 6 file://mkdir_p.patch \
7 file://0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch \ 7 file://0001-tests-u_direct_io-expect-correct-expected-output.patch \
8 file://0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch \
9 " 8 "
10 9
11SRC_URI:append:class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ 10SRC_URI:append:class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
12 file://quiet-debugfs.patch \ 11 file://quiet-debugfs.patch \
13 file://big-inodes-for-small-fs.patch \
14" 12"
15 13
16 14SRCREV = "849005eac51ea2097bd9e5f2b0adc16b53c5486d"
17SRCREV = "1eea0e2bd9a6760ebad834d5d2cf700fffe5ebe2"
18UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" 15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
19 16
20EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ 17EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 23:17:27 +0000