Re: [OE-core] [PATCH 05/24] e2fsprogs: upgrade 1.46.4 -> 1.46.5

Otavio Salvador
2022-01-03T18:26:36Z

Em seg., 3 de jan. de 2022 às 14:42, Richard Purdie
<richard.purdie@linuxfoundation.org> escreveu:
> On Mon, 2022-01-03 at 13:18 -0300, Otavio Salvador wrote:
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> > ...ct_io-expect-correct-expected-output.patch | 69 -------------------
> > ...-missing-check-for-permission-denied.patch | 3 +-
> > .../e2fsprogs/e2fsprogs/quiet-debugfs.patch | 3 +-
> > ...2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} | 9 +--
> > 4 files changed, 7 insertions(+), 77 deletions(-)
> > delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
> > rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} (94%)
> >
> > 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
> > deleted file mode 100644
> > index f198df83eb..0000000000
> > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
> > +++ /dev/null
> > @@ -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
> > 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 a4f98246bb..045ffa6086 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,7 +1,8 @@
> > -From f1e161a48f74b46ae3c99921971c4b5ae8d587c9 Mon Sep 17 00:00:00 2001
> > +From ad7f927c0d95fd461f45f478bbe6355b8df46eac 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.
> > +Organization: O.S. Systems Software LTDA.
> >
> > If the path to "ROOT_SYSCONFDIR/mke2fs.conf" has a permission denied problem,
> > then the get_dirlist() call will return EACCES. But the code in profile_init
> > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
> > index 41a4047622..6f3ad342cc 100644
> > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
> > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
> > @@ -1,7 +1,8 @@
> > -From 550b5fbece84dde16ce9910c2cad390ea4a2f5d5 Mon Sep 17 00:00:00 2001
> > +From 5e5820fd214a0bc25907053ae6a76eb1ec493134 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
> > +Organization: O.S. Systems Software LTDA.
> >
> > When executing a script don't echo every command, as we do this for entire
> > filesystems at rootfs time.
>
> Thanks for the upgrades!
>
> Adding OS Systems headers to existing patch files like this with no real other
> changes doesn't seem like it may have been intended?

I'll remove it and regen all patches.

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750