mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
e2fsprogs: upgrade 1.46.4 -> 1.46.5
Remove patch as upstream addressed the issue. (From OE-Core rev: cf11425c460ee4ff6b7ac0221a21b13b2d2b7e1e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
64e0f14a56
commit
4000afbeb4
@@ -1,69 +0,0 @@
|
||||
From ea5adf259e01c790f9ba69d6fe88d691de410b6f Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sun, 22 Aug 2021 14:37:32 +0200
|
||||
Subject: [PATCH] tests/u_direct_io/expect: correct expected output
|
||||
|
||||
This is likely the right fix, but upstream needs to confirm.
|
||||
|
||||
Upstream-Status: Inappropriate [issue reported https://github.com/tytso/e2fsprogs/issues/80]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
tests/u_direct_io/expect | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
|
||||
index b0cdc730..830cbd75 100644
|
||||
--- a/tests/u_direct_io/expect
|
||||
+++ b/tests/u_direct_io/expect
|
||||
@@ -19,8 +19,8 @@ Filesystem OS type: Linux
|
||||
Inode count: 32768
|
||||
Block count: 32768
|
||||
Reserved block count: 1638
|
||||
-Overhead clusters: 5131
|
||||
-Free blocks: 27631
|
||||
+Overhead clusters: 6155
|
||||
+Free blocks: 26607
|
||||
Free inodes: 32757
|
||||
First block: 0
|
||||
Block size: 4096
|
||||
@@ -29,27 +29,29 @@ Reserved GDT blocks: 7
|
||||
Blocks per group: 32768
|
||||
Fragments per group: 32768
|
||||
Inodes per group: 32768
|
||||
-Inode blocks per group: 1024
|
||||
+Inode blocks per group: 2048
|
||||
Flex block group size: 16
|
||||
Mount count: 0
|
||||
Check interval: 15552000 (6 months)
|
||||
Reserved blocks uid: 0
|
||||
Reserved blocks gid: 0
|
||||
First inode: 11
|
||||
-Inode size: 128
|
||||
+Inode size: 256
|
||||
+Required extra isize: 32
|
||||
+Desired extra isize: 32
|
||||
Journal inode: 8
|
||||
Default directory hash: half_md4
|
||||
Journal backup: inode blocks
|
||||
Directories: 2
|
||||
Group 0: block bitmap at 9, inode bitmap at 25, inode table at 41
|
||||
- 27631 free blocks, 32757 free inodes, 2 used directories
|
||||
+ 26607 free blocks, 32757 free inodes, 2 used directories
|
||||
e2fsck -fn -N test_filesys $LOOP
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
Pass 2: Checking directory structure
|
||||
Pass 3: Checking directory connectivity
|
||||
Pass 4: Checking reference counts
|
||||
Pass 5: Checking group summary information
|
||||
-test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks
|
||||
+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks
|
||||
Exit status is 0
|
||||
e2fsck -fn -N test_filesys $TMPFILE
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
@@ -57,5 +59,5 @@ Pass 2: Checking directory structure
|
||||
Pass 3: Checking directory connectivity
|
||||
Pass 4: Checking reference counts
|
||||
Pass 5: Checking group summary information
|
||||
-test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks
|
||||
+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks
|
||||
Exit status is 0
|
||||
@@ -1,4 +1,4 @@
|
||||
From f1e161a48f74b46ae3c99921971c4b5ae8d587c9 Mon Sep 17 00:00:00 2001
|
||||
From 22d7557905534d9e1b39f7d2a6d2036a40bf0c4e Mon Sep 17 00:00:00 2001
|
||||
From: Jackie Huang <jackie.huang@windriver.com>
|
||||
Date: Wed, 10 Aug 2016 11:19:44 +0800
|
||||
Subject: [PATCH] Fix missing check for permission denied.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 550b5fbece84dde16ce9910c2cad390ea4a2f5d5 Mon Sep 17 00:00:00 2001
|
||||
From 5408b6463ee700a080a15102bccccdeb2615d734 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Mon, 23 Dec 2013 13:38:34 +0000
|
||||
Subject: [PATCH] e2fsprogs: silence debugfs
|
||||
|
||||
@@ -4,14 +4,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \
|
||||
file://run-ptest \
|
||||
file://ptest.patch \
|
||||
file://mkdir_p.patch \
|
||||
file://0001-tests-u_direct_io-expect-correct-expected-output.patch \
|
||||
"
|
||||
SRC_URI:append:class-native = " \
|
||||
file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
|
||||
file://quiet-debugfs.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
|
||||
file://quiet-debugfs.patch \
|
||||
"
|
||||
|
||||
SRCREV = "849005eac51ea2097bd9e5f2b0adc16b53c5486d"
|
||||
SRCREV = "02540dedd3ddc52c6ae8aaa8a95ce75c3f8be1c0"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
|
||||
|
||||
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
|
||||
Reference in New Issue
Block a user