[OE-core] [PATCH] resolvconf: upgrade 1.87 -> 1.90

[OE-core] [PATCH] resolvconf: upgrade 1.87 -> 1.90

[Wang Mingyu]

Remove fix-path-for-busybox.patch
since it is included in 1.90

Changelog:
=========
 * Add basic support for ifupdown2 multiple address families
    (Closes: #993270).
  * Move the normalisation script into a separate file.
  * Add a build-time test to verify interface order list is correct.
  * Synchronise the interface order lists.
  * Make the usage notice more useful.
  * Embed the version number during the package build process.
  * Add --version command.
  * Add --help/-h.
  * Remove a pointless use of which(1), since we know where ifquery lives.
  * Update copyright years.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../resolvconf/fix-path-for-busybox.patch     | 20 -------------------
 ...{resolvconf_1.87.bb => resolvconf_1.90.bb} |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.87.bb => resolvconf_1.90.bb} (96%)

diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
deleted file mode 100644
index 1aead07869..0000000000
--- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-busybox installs readlink into /usr/bin, so ensure /usr/bin
-is in the path.
-
-Upstream-Status: Submitted
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: resolvconf-1.76/etc/resolvconf/update.d/libc
-===================================================================
---- resolvconf-1.76.orig/etc/resolvconf/update.d/libc
-+++ resolvconf-1.76/etc/resolvconf/update.d/libc
-@@ -16,7 +16,7 @@
- #
- 
- set -e
--PATH=/sbin:/bin
-+PATH=/sbin:/bin:/usr/bin
- 
- [ -x /lib/resolvconf/list-records ] || exit 1
- 
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
similarity index 96%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
index f57abe3619..54d114d7b6 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
@@ -12,11 +12,10 @@ HOMEPAGE = "http://packages.debian.org/resolvconf"
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \
-           file://fix-path-for-busybox.patch \
            file://99_resolvconf \
            "
 
-SRCREV = "1dda36d8465e335c60190c41e7185d782da1bd7b"
+SRCREV = "0a06ef77f4022f8cea2edb7c3013af5a7ddc983d"
 
 S = "${WORKDIR}/git"
 
-- 
2.25.1

[OE-core] [PATCH] e2fsprogs: upgrade 1.46.4 -> 1.46.5

[Wang Mingyu]

Remove 0001-tests-u_direct_io-expect-correct-expected-output.patch
since it is included in 1.46.5

Changelog:
=========
UI and Features
---------------
When resizing a file system and the inode count exceeds the 2**32 maximum, if
resize2fs can successfully perform the resize by dropping the last block group,
resize2fs will do that in order to allow the file system grow operation to
succeed. For example, using the default inode ratio size of 16k, this will
allow a successful resize to 64TB - 128MB when the storage device is 64TB.

Fixes
--------------
Avoid a potential infinite loop in resize2fs -P when the file system is
corrupted (introduced in e2fsprogs 1.45.5).
(Addresses github issue https://github.com/tytso/e2fsprogs/issues/94)

E2fsck now updates the bg_checksum after fixing problems in the block group
descriptor, which eliminates some unnecessary messages printed or asked of the
system administrator.

Fixed some potential deadlock problems in the unix_io handler in the case of I/O
errors. The fix should also improve the performance of parallel bitmap loading.

Fixed e2fsck's fast commit handling which could result it in crashing when
trying to merge extents when there were none available to be merged.

Fix e2fsck's support of quota limit data, which could sometimes get dropped when
the quota data needs to be regenerated, or when processing the orphan list.

Fix tune2fs to correctly transfer the quota limits when converting quota files
to the internal quota inodes. Also add support for tune2fs to properly handle
the older version 0 quota files.

Fix debugfs's get_quota and list_quota commands so that the header of the report
printed by these commands correctly reflect that the units of used space is in
bytes instead of blocks.

Performance, Internal Implementation, Development Support etc.
Add some additional packages to the setup-schroot script to account for the fact
that the script can be run on older Debian distributions and so the build
dependencies might omit some packages needed to build e2fsprogs on unstable
version of Debian.

Reduce resize2fs's CPU overhead when counting the number of blocks in use which
can reduce the wall clock time for very large file systems by substantial amount

Teach libuuid to use getrandom() or getentropy() if available in favor of
reading from /dev/[u]random.

Teach libss to use libreadline.so.8 if it is available.

Update some test expect files to fix some regression tests that were broken in
e2fsprogs 1.46.4.

If the PRINT_FAILED environment variable is set, failed tests will display the
diff output to make it easier to debug test failures on autobuilders.

Fix various compiler warnings.

Update tst_getsize to use ext2fs_get_size2() to support testing devices which
are larger than 2**32 sectors.

Fixed spelling mistakes in the mke2fs.conf man page.

Update Chinese, Malay, Serbian, Spanish, Swedish, and Ukrainian translations.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ct_io-expect-correct-expected-output.patch | 69 -------------------
 ...2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} |  3 +-
 2 files changed, 1 insertion(+), 71 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} (97%)

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_1.46.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb
similarity index 97%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.4.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb
index f42cefcaf9..aa015f1648 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb
@@ -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 \
 "
 
-SRCREV = "849005eac51ea2097bd9e5f2b0adc16b53c5486d"
+SRCREV = "02540dedd3ddc52c6ae8aaa8a95ce75c3f8be1c0"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
-- 
2.25.1