Hi,

Can we please have this patch backported to the kirkstone branch ASAP since builds including this package are currently broken?

Cheers,
Diego Sueiro

From: Zoltán Böszörményi <zboszor@...>

It needs PROJ.4 >= 8.x and the fix for setuptools in oe-core.

Signed-off-by: Zoltán Böszörményi <zboszor@...>
---
.../recipes-devtools/python/python3-pyproj_3.3.1.bb | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb

diff --git a/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb b/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb
new file mode 100644
index 000000000..ebef1e74c
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Python interface to PROJ (cartographic projections and coordinate transformations library)"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dc4bb2668871655e24030dfe8d2a7ce7"
+DEPENDS = "python3-cython proj"
+DEPENDS:append:class-target = " proj-native python3-cython-native"
+
+PYPI_PACKAGE = "pyproj"
+
+inherit pypi setuptools3
+
+SRC_URI[sha256sum] = "b3d8e14d91cc95fb3dbc03a9d0588ac58326803eefa5bbb0978d109de3304fbe"
+
+RDEPENDS:${PN} = "${PYTHON_PN}-cython proj"
--
2.36.1

From: Zoltán Böszörményi <zboszor@...>

Signed-off-by: Zoltán Böszörményi <zboszor@...>
---
.../recipes-navigation/proj/{proj_7.0.1.bb => proj_8.2.1.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-oe/recipes-navigation/proj/{proj_7.0.1.bb => proj_8.2.1.bb} (63%)

diff --git a/meta-oe/recipes-navigation/proj/proj_7.0.1.bb b/meta-oe/recipes-navigation/proj/proj_8.2.1.bb
similarity index 63%
rename from meta-oe/recipes-navigation/proj/proj_7.0.1.bb
rename to meta-oe/recipes-navigation/proj/proj_8.2.1.bb
index 98e57f21e..8540401a6 100644
--- a/meta-oe/recipes-navigation/proj/proj_7.0.1.bb
+++ b/meta-oe/recipes-navigation/proj/proj_8.2.1.bb
@@ -3,12 +3,11 @@ HOMEPAGE = "http://trac.osgeo.org/proj/"
SECTION = "libs"

LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff"

SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz"

-SRC_URI[md5sum] = "5ba7536b579a6c9e0ad822dbdd455985"
-SRC_URI[sha256sum] = "a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f"
+SRC_URI[sha256sum] = "76ed3d0c3a348a6693dfae535e5658bbfd47f71cb7ff7eb96d9f12f7e068b1cf"

DEPENDS = "sqlite3 sqlite3-native tiff"

--
2.36.1

Changelog:
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

Fixed:
------
prevent teardown, teardown_file, and teardown_suite from overriding bats'
exit code by setting $status (e.g. via calling run) (#581, #575)
CRITICAL: this can return exit code 0 despite failed tests, thus preventi=
ng
your CI from reporting test failures! The regression happened in version =
1.6.0.

Documentation:
--------------
corrected invalid documentation of run -N (had =3DN instead) (#579)
CRITICAL: using the incorrect form can lead to silent errors. See issue #=
578
for more details and how to find out if your tests are affected.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
.../recipes-test/bats/{bats_1.6.0.bb =3D> bats_1.6.1.bb} | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
rename meta-oe/recipes-test/bats/{bats_1.6.0.bb =3D> bats_1.6.1.bb} (85%=
)

diff --git a/meta-oe/recipes-test/bats/bats_1.6.0.bb b/meta-oe/recipes-te=
st/bats/bats_1.6.1.bb
similarity index 85%
rename from meta-oe/recipes-test/bats/bats_1.6.0.bb
rename to meta-oe/recipes-test/bats/bats_1.6.1.bb
index 7ea1aa8f3..7d72a5198 100644
--- a/meta-oe/recipes-test/bats/bats_1.6.0.bb
+++ b/meta-oe/recipes-test/bats/bats_1.6.1.bb
@@ -6,9 +6,12 @@ HOMEPAGE =3D "https://github.com/bats-core/bats-core"
LICENSE =3D "MIT"
LIC_FILES_CHKSUM =3D "file://LICENSE.md;md5=3D2970203aedf9e829edb96a137a=
4fe81b"
=20
-SRC_URI =3D "git://github.com/bats-core/bats-core.git;branch=3Dmaster;pr=
otocol=3Dhttps"
-# v1.4.1
-SRCREV =3D "210acf3a8ed318ddedad3137c15451739beba7d4"
+SRC_URI =3D "\
+ git://github.com/bats-core/bats-core.git;branch=3Dversion/1.6.x;protoc=
ol=3Dhttps \
+ "
+
+# v1.6.1
+SRCREV =3D "1977254c2a7faa2e0af17355856f91dc471d1daa"
=20
S =3D "${WORKDIR}/git"
=20
--=20
2.35.1

The following changes since commit 5357c7a40eaf8d1bcf7ff58edbba8e9527e40c7d:

  boinc-client: Make script install not depend on host install paths (2022-05-03 06:49:08 -0700)

are available in the Git repository at:

  https://git.openembedded.org/meta-openembedded kirkstone-next

for you to fetch changes up to 166ef8dbb14ad98b2094a77fcf352f6c63d5abf2:

  minidlna: fix obsolete license warning (2022-05-17 05:57:10 -0700)

----------------------------------------------------------------
Armin Kuster (3):
      meta-oe-image: fix build depends
      meta-python-image: Fix build depends
      meta-gnome: fix layer depends.

Bassem Boubaker (1):
      conntrack-tools: Fix missing capability

Denys Dmytriyenko (2):
      devmem2: reinstate previous patches, removed by mistake
      devmem2: add support for different page sizes

Gianfranco Costamagna (1):
      vboxguestdrivers: upgrade 6.1.32 -> 6.1.34

Jiaqing Zhao (2):
      openldap: Remove libgcrypt dependency
      openldap: Upgrade 2.5.9 -> 2.5.12

Khem Raj (7):
      ufw: Fix packaging errors found with ppc64
      libcereal: Enable for glibc/ppc
      mimic: Use special rateconv.c license
      makedumpfile: Use right TARGET for ppc32
      evince: Add dbus to depnedencies on non-x11 builds
      evolution-data-server: Do not pass --library-path to gir compiler
      python3-wxgtk4: Needs x11 for sip module

Markus Volk (1):
      minidlna: fix obsolete license warning

Michael Opdenacker (1):
      devmem2: update SRC_URI according to redirect

Mingli Yu (1):
      s-nail: Set VAL_MTA

Xu Huan (1):
      python3-astroid: upgrade 2.11.2 -> 2.11.3

Yi Zhao (2):
      frr: inherit autotools-brokensep instead of autotools
      networkmanager: fix parallel build failure

 meta-gnome/conf/layer.conf                                      | 2 +-
 meta-gnome/recipes-gnome/evince/evince_42.2.bb                  | 2 +-
 .../0001-cmake-Do-not-export-CC-into-gir-compiler.patch         | 14 ++++-
 meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb       | 2 +-
 meta-multimedia/recipes-multimedia/minidlna/minidlna.inc        | 2 +-
 ...1-libnm-client-test-add-dependency-libnm_client_public.patch | 34 +++++++++++
 .../networkmanager/networkmanager_1.36.2.bb                     | 1 +
 meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb          | 2 +-
 .../recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb     | 5 ++
 meta-networking/recipes-protocols/frr/frr_8.2.2.bb              | 6 +-
 meta-oe/licenses/rateconv                                       | 27 +++++++++
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb      | 8 +--
 .../s-nail/files/0001-make.rc-set-VAL_MTA.patch                 | 48 +++++++++++++++
 meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb               | 3 +-
 meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb       | 6 +-
 meta-oe/recipes-support/devmem2/devmem2.bb                      | 7 ++-
 ...1-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch | 70 ++++++++++++++++++++++
 .../0001-devmem2-support-different-page-sizes-at-run-time.patch | 35 +++++++++++
 meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch  | 91 +++++++++++++++++++++++++++++
 meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb            | 6 +-
 .../openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch       | 15 -----
 .../openldap/{openldap_2.5.9.bb => openldap_2.5.12.bb} |  8 +--
 .../{vboxguestdrivers_6.1.32.bb => vboxguestdrivers_6.1.34.bb} |  2 +-
 .../recipes-core/packagegroups/packagegroup-meta-python.bb      | 10 ++--
 .../{python3-astroid_2.11.2.bb => python3-astroid_2.11.3.bb} |  2 +-
 .../recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb     | 2 +-
 26 files changed, 361 insertions(+), 49 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch
 create mode 100644 meta-oe/licenses/rateconv
 create mode 100644 meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch
 create mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch
 create mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch
 create mode 100644 meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
 delete mode 100644 meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
 rename meta-oe/recipes-support/openldap/{openldap_2.5.9.bb => openldap_2.5.12.bb} (96%)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.32.bb => vboxguestdrivers_6.1.34.bb} (97%)
 rename meta-python/recipes-devtools/python/{python3-astroid_2.11.2.bb => python3-astroid_2.11.3.bb} (89%)

Adds compatibility with antlr4 version 4.10.

Signed-off-by: Samuli Piippo <samuli.piippo@...>
---
.../python/{python3-qface_2.0.7.bb => python3-qface_2.0.8.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-qface_2.0.7.bb => python3-qface_2.0.8.bb} (85%)

diff --git a/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb b/meta-python/recipes-devtools/python/python3-qface_2.0.8.bb
similarity index 85%
rename from meta-python/recipes-devtools/python/python3-qface_2.0.7.bb
rename to meta-python/recipes-devtools/python/python3-qface_2.0.8.bb
index c42b91fcd..47a34d44b 100644
--- a/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb
+++ b/meta-python/recipes-devtools/python/python3-qface_2.0.8.bb
@@ -2,7 +2,7 @@ SUMMARY = "A generator framework based on a common modern IDL"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5"

-SRC_URI[sha256sum] = "fae48ba129c55da8445580eb711905c03911c4250761c0cd53c67e33495b0cee"
+SRC_URI[sha256sum] = "eccee7dbc4290c5a4e394df8d527f39148e0de0ff22c6b260f48c48f12b3beb4"

inherit pypi python_setuptools_build_meta

--
2.25.1

perhaps get this enabled by default in linux-yocto kernel defconfigs

Enguerrand de Ribaucourt 於 2022/2/2 下午 05:59 寫道:

Thank you for your feedback. The build fails on those MACHINEs because the kernel
configuration does not enables the MDIO bus support.
I could successfully build the recipes on both MACHINEs by adding the following
kernel configuration fragment:

---
CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_BCM_UNIMAC is not set
# CONFIG_MDIO_MVUSB is not set
# CONFIG_MDIO_MSCC_MIIM is not set
# CONFIG_MDIO_THUNDER is not set

#
# MDIO Multiplexers
#
# CONFIG_PCS_XPCS is not set
---

What would be the best way to approach this?

----- Original Message -----

From: "raj khem" <raj.khem@...>
To: "Enguerrand de Ribaucourt" <enguerrand.de-ribaucourt@...>
Cc: "openembedded-devel" <openembedded-devel@...>, "joe" <joe@...>
Sent: Wednesday, February 2, 2022 6:35:22 AM
Subject: Re: [meta-networking][PATCH V2] mdio-tools: add recipes
this fails on mips
https://errors.yoctoproject.org/Errors/Details/623861/
aarch64
https://errors.yoctoproject.org/Errors/Details/623865/
On Tue, Feb 1, 2022 at 6:45 AM Enguerrand de Ribaucourt
<enguerrand.de-ribaucourt@...> wrote:

----- Mail original -----

De: "Enguerrand de Ribaucourt" <enguerrand.de-ribaucourt@...>
À: openembedded-devel@...
Cc: "raj khem" <raj.khem@...>, joe@..., "Enguerrand de
Ribaucourt"
<enguerrand.de-ribaucourt@...>
Envoyé: Mardi 1 Février 2022 15:26:10
Objet: [meta-networking][PATCH V2] mdio-tools: add recipes

Hi,
mdio-tools is a similar tool to phytool, by the same author, which is already
present in meta-networking. This one allows a more low-level access to the MDIO
bus as well as writing with the use of a kernel module.
I re-submitted the patch with some small corrections to respect coding style
conventions:
1. Moved in recipes-support
2. Removed version in mdio-tools_1.0.1.inc filename
Please let me know if these recipes are relevant to meta-networking or if you
have any comments about them.
Thank you for your time.

Self-description from the README: mdio-tools is a low-level debug tool
for communicating with devices attached to an MDIO bus.
Signed-off-by: Enguerrand de Ribaucourt
<enguerrand.de-ribaucourt@...>
---
.../mdio-tools/mdio-netlink_1.0.1.bb | 13 +++++++++++++
.../recipes-support/mdio-tools/mdio-tools.inc | 8 ++++++++
.../recipes-support/mdio-tools/mdio-tools_1.0.1.bb | 9 +++++++++
3 files changed, 30 insertions(+)
create mode 100644
meta-networking/recipes-support/mdio-tools/mdio-netlink_1.0.1.bb
create mode 100644 meta-networking/recipes-support/mdio-tools/mdio-tools.inc
create mode 100644
meta-networking/recipes-support/mdio-tools/mdio-tools_1.0.1.bb
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.0.1.bb
b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.0.1.bb
new file mode 100644
index 000000000..b50d33f90
--- /dev/null
+++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.0.1.bb
@@ -0,0 +1,13 @@
+require mdio-tools.inc
+
+DEPENDS += "virtual/kernel libmnl"
+# This module requires Linux 5.6 higher
+
+S = "${WORKDIR}/git/kernel"
+
+inherit module
+
+EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR}"
+MODULES_INSTALL_TARGET = "install"
+
+RPROVIDES:${PN} += "kernel-module-mdio-netlink"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
new file mode 100644
index 000000000..bba8960d8
--- /dev/null
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "A low-level debug tool for communicating with devices attached
to an MDIO bus"
+SECTION = "networking"
+HOMEPAGE = "https://github.com/wkz/mdio-tools"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master"
+SRCREV = "b40809dd59aa199d8afc307e228b55eeae06b17e"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.0.1.bb
b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.0.1.bb
new file mode 100644
index 000000000..cd4df3da0
--- /dev/null
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.0.1.bb
@@ -0,0 +1,9 @@
+require mdio-tools.inc
+
+DEPENDS += "libmnl"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig autotools
+
+RDEPENDS:${PN} = "kernel-module-mdio-netlink"
--
2.25.1

Hi Maintainer,

I am looking forward to add mdio-tools package support into openembedded. I find this post, but it looks not been updated for few month.
Just wondering that would you give some advice for adding extra kernel configurations? or it is possible adding configs into defconfig for `mips` and `aarch64`?

BR,

Potin

We are finalizing the agenda for the developer meeting this Friday (May 20). The agenda has some topics carried from prior meetings and some new ideas we will cover at the bottom. We would like to get additional topics that matter to users and developers. Please review:

https://www.openembedded.org/wiki/OEDVM_2022_05

and add your ideas for topics we should discuss. Members of the OpenEmbedded board and Technical steering committee will be around on irc in #oe on libera.chat.

Philip

On 5/16/22 12:52 PM, Sean Anderson wrote:

If the source image's size is not aligned to the sparse image's block
size, then conversion will fail with

img2simg: libsparse/sparse.cpp:133: int write_all_blocks(sparse_file*, output_file*): Assertion `pad >= 0' failed.

This is a bug in img2simg, but an easy way to work around it is to pad
the source image ourselves. The default block size of 4096 matches
img2simg's default block size.

Signed-off-by: Sean Anderson <sean.anderson@...>
---

Changes in v2:
- New

meta-oe/classes/image_types_sparse.bbclass | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta-oe/classes/image_types_sparse.bbclass b/meta-oe/classes/image_types_sparse.bbclass
index 4263593a8d..58221888ed 100644
--- a/meta-oe/classes/image_types_sparse.bbclass
+++ b/meta-oe/classes/image_types_sparse.bbclass
@@ -1,8 +1,17 @@
inherit image_types

+# This sets the granularity of the sparse image conversion. Chunk sizes will be
+# specified in units of this value. Setting this value smaller than the
+# underlying image's block size will not result in any further space saving.
+# However, there is no loss in correctness if this value is larger or smaller
+# than optimal. This value should be a power of two.
+SPARSE_BLOCK_SIZE ??= "4096"
+
+convert_sparse() {

It looks like this could be specified directly like

CONVERSION_CMD:sparse() {
...
}

This will be fixed in v3.

--Sean

+ truncate --no-create --size=%${SPARSE_BLOCK_SIZE} "$1"
+ img2simg "$1" "$1.sparse" ${SPARSE_BLOCK_SIZE}
+}
+
CONVERSIONTYPES += "sparse"
-CONVERSION_CMD:sparse = " \
- img2simg "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" \
- "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" \
-"
+CONVERSION_CMD:sparse = "convert_sparse '${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}'"
CONVERSION_DEPENDS_sparse = "android-tools-native"

By default, img2simg will only generate raw and fill chunks. This adds
support for "don't care" chunks, based on file holes. This is similar to
how bmaptool works. "don't care" chunks do not need to be written,
speeding up flashing time.

Signed-off-by: Sean Anderson <sean.anderson@...>
---

(no changes since v1)

meta-oe/classes/image_types_sparse.bbclass | 2 +-
...off-most-of-sparse_file_read_normal-.patch | 60 ++++++
...se-Add-hole-mode-to-sparse_file_read.patch | 188 ++++++++++++++++++
...port-for-converting-holes-to-don-t-c.patch | 114 +++++++++++
.../android-tools/android-tools_5.1.1.r37.bb | 3 +
5 files changed, 366 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
create mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
create mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch

diff --git a/meta-oe/classes/image_types_sparse.bbclass b/meta-oe/classes/image_types_sparse.bbclass
index 58221888ed..1fdc51c647 100644
--- a/meta-oe/classes/image_types_sparse.bbclass
+++ b/meta-oe/classes/image_types_sparse.bbclass
@@ -9,7 +9,7 @@ SPARSE_BLOCK_SIZE ??= "4096"

convert_sparse() {
truncate --no-create --size=%${SPARSE_BLOCK_SIZE} "$1"
- img2simg "$1" "$1.sparse" ${SPARSE_BLOCK_SIZE}
+ img2simg -s "$1" "$1.sparse" ${SPARSE_BLOCK_SIZE}
}

CONVERSIONTYPES += "sparse"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
new file mode 100644
index 0000000000..b3893f0c80
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
@@ -0,0 +1,60 @@
+From 7b74d23ed955206a789a96bdc3288593e702afac Mon Sep 17 00:00:00 2001
+From: Sean Anderson <sean.anderson@...>
+Date: Thu, 30 Dec 2021 15:16:08 -0500
+Subject: [PATCH] libsparse: Split off most of sparse_file_read_normal into a
+ helper function
+
+This carves out the core of sparse_file_read_normal and splits it off so
+it can be reused in the next patch. No functional change intended.
+
+Change-Id: Id00491fd7e5bb6fa28c517a0bb32b8b506539d4d
+Upstream-status: Backport [95657f3e5976d96073f7bbfe3a49192509999d1d]
+Signed-off-by: Sean Anderson <sean.anderson@...>
+---
+ libsparse/sparse_read.c | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
+index 8e188e9a4..ee4abd86a 100644
+--- a/libsparse/sparse_read.c
++++ b/libsparse/sparse_read.c
+@@ -353,13 +353,11 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
+ return 0;
+ }
+
+-static int sparse_file_read_normal(struct sparse_file *s, int fd)
++static int do_sparse_file_read_normal(struct sparse_file *s, int fd, uint32_t* buf, int64_t offset,
++ int64_t remain)
+ {
+ int ret;
+- uint32_t *buf = malloc(s->block_size);
+- unsigned int block = 0;
+- int64_t remain = s->len;
+- int64_t offset = 0;
++ unsigned int block = offset / s->block_size;
+ unsigned int to_read;
+ unsigned int i;
+ bool sparse_block;
+@@ -403,6 +401,19 @@ static int sparse_file_read_normal(struct sparse_file *s, int fd)
+ return 0;
+ }
+
++static int sparse_file_read_normal(struct sparse_file* s, int fd)
++{
++ int ret;
++ uint32_t* buf = (uint32_t*)malloc(s->block_size);
++
++ if (!buf)
++ return -ENOMEM;
++
++ ret = do_sparse_file_read_normal(s, fd, buf, 0, s->len);
++ free(buf);
++ return ret;
++}
++
+ int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
+ {
+ if (crc && !sparse) {
+--
+2.35.1.1320.gc452695387.dirty
+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
new file mode 100644
index 0000000000..e5221d2b4c
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
@@ -0,0 +1,188 @@
+From 41574b628ec4229c24dfe289af7b6978edcca4ed Mon Sep 17 00:00:00 2001
+From: Sean Anderson <sean.anderson@...>
+Date: Thu, 30 Dec 2021 15:19:41 -0500
+Subject: [PATCH] libsparse: Add "hole" mode to sparse_file_read
+
+This adds support for filesystem-level sparse files. These files have
+holes which are not stored in the filesystem and when read are full of
+zeros. While these zeros may be significant in some types of files,
+other types of files may not care about the contents of holes. For
+example, most filesystem creation tools write to all the blocks they
+care about. Those blocks not written to will remain holes, and can be
+safely represented by "don't care" chunks. Using "don't care" chunks
+instead of fill chunks can result in a substantial reduction of the time
+it takes to program a sparse image.
+
+To accomplish this, we extend the existing "sparse" boolean parameter to
+be an enum of mode types. This enum represents the strategy we take when
+reading in a file. For the most part the implementation is
+straightforward. We use lseek to determine where the holes in the file
+are, and then use do_sparse_file_read_normal to create chunks for the
+data section. Note that every file has an implicit hole at its end.
+
+Change-Id: I0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
+Upstream-Status: Backport [f96466b05543b984ef7315d830bab4a409228d35]
+Signed-off-by: Sean Anderson <sean.anderson@...>
+---
+ libsparse/img2simg.c | 2 +-
+ libsparse/include/sparse/sparse.h | 32 +++++++++++---
+ libsparse/sparse_read.c | 71 +++++++++++++++++++++++++++++--
+ 3 files changed, 93 insertions(+), 12 deletions(-)
+
+diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c
+index a0db36f45..2e171b613 100644
+--- a/libsparse/img2simg.c
++++ b/libsparse/img2simg.c
+@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
+ }
+
+ sparse_file_verbose(s);
+- ret = sparse_file_read(s, in, false, false);
++ ret = sparse_file_read(s, in, SPARSE_READ_MODE_NORMAL, false);
+ if (ret) {
+ fprintf(stderr, "Failed to read file\n");
+ exit(-1);
+diff --git a/libsparse/include/sparse/sparse.h b/libsparse/include/sparse/sparse.h
+index 8b757d22a..b68aa21a8 100644
+--- a/libsparse/include/sparse/sparse.h
++++ b/libsparse/include/sparse/sparse.h
+@@ -196,23 +196,41 @@ int64_t sparse_file_len(struct sparse_file *s, bool sparse, bool crc);
+ int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
+ int (*write)(void *priv, const void *data, int len), void *priv);
+
++/**
++ * enum sparse_read_mode - The method to use when reading in files
++ * @SPARSE_READ_MODE_NORMAL: The input is a regular file. Constant chunks of
++ * data (including holes) will be be converted to
++ * fill chunks.
++ * @SPARSE_READ_MODE_SPARSE: The input is an Android sparse file.
++ * @SPARSE_READ_MODE_HOLE: The input is a regular file. Holes will be converted
++ * to "don't care" chunks. Other constant chunks will
++ * be converted to fill chunks.
++ */
++enum sparse_read_mode {
++ SPARSE_READ_MODE_NORMAL = false,
++ SPARSE_READ_MODE_SPARSE = true,
++ SPARSE_READ_MODE_HOLE,
++};
++
+ /**
+ * sparse_file_read - read a file into a sparse file cookie
+ *
+ * @s - sparse file cookie
+ * @fd - file descriptor to read from
+- * @sparse - read a file in the Android sparse file format
++ * @mode - mode to use when reading the input file
+ * @crc - verify the crc of a file in the Android sparse file format
+ *
+- * Reads a file into a sparse file cookie. If sparse is true, the file is
+- * assumed to be in the Android sparse file format. If sparse is false, the
+- * file will be sparsed by looking for block aligned chunks of all zeros or
+- * another 32 bit value. If crc is true, the crc of the sparse file will be
+- * verified.
++ * Reads a file into a sparse file cookie. If @mode is
++ * %SPARSE_READ_MODE_SPARSE, the file is assumed to be in the Android sparse
++ * file format. If @mode is %SPARSE_READ_MODE_NORMAL, the file will be sparsed
++ * by looking for block aligned chunks of all zeros or another 32 bit value. If
++ * @mode is %SPARSE_READ_MODE_HOLE, the file will be sparsed like
++ * %SPARSE_READ_MODE_NORMAL, but holes in the file will be converted to "don't
++ * care" chunks. If crc is true, the crc of the sparse file will be verified.
+ *
+ * Returns 0 on success, negative errno on error.
+ */
+-int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc);
++int sparse_file_read(struct sparse_file *s, int fd, enum sparse_read_mode mode, bool crc);
+
+ /**
+ * sparse_file_import - import an existing sparse file
+diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
+index ee4abd86a..81f48cc13 100644
+--- a/libsparse/sparse_read.c
++++ b/libsparse/sparse_read.c
+@@ -414,16 +414,79 @@ static int sparse_file_read_normal(struct sparse_file* s, int fd)
+ return ret;
+ }
+
+-int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
++#ifdef __linux__
++static int sparse_file_read_hole(struct sparse_file* s, int fd)
+ {
+- if (crc && !sparse) {
++ int ret;
++ uint32_t* buf = (uint32_t*)malloc(s->block_size);
++ int64_t end = 0;
++ int64_t start = 0;
++
++ if (!buf) {
++ return -ENOMEM;
++ }
++
++ do {
++ start = lseek(fd, end, SEEK_DATA);
++ if (start < 0) {
++ if (errno == ENXIO)
++ /* The rest of the file is a hole */
++ break;
++
++ error("could not seek to data");
++ free(buf);
++ return -errno;
++ } else if (start > s->len) {
++ break;
++ }
++
++ end = lseek(fd, start, SEEK_HOLE);
++ if (end < 0) {
++ error("could not seek to end");
++ free(buf);
++ return -errno;
++ }
++ end = min(end, s->len);
++
++ start = ALIGN_DOWN(start, s->block_size);
++ end = ALIGN(end, s->block_size);
++ if (lseek(fd, start, SEEK_SET) < 0) {
++ free(buf);
++ return -errno;
++ }
++
++ ret = do_sparse_file_read_normal(s, fd, buf, start, end - start);
++ if (ret) {
++ free(buf);
++ return ret;
++ }
++ } while (end < s->len);
++
++ free(buf);
++ return 0;
++}
++#else
++static int sparse_file_read_hole(struct sparse_file* s __unused, int fd __unused)
++{
++ return -ENOTSUP;
++}
++#endif
++
++int sparse_file_read(struct sparse_file *s, int fd, enum sparse_read_mode mode, bool crc)
++{
++ if (crc && mode != SPARSE_READ_MODE_SPARSE) {
+ return -EINVAL;
+ }
+
+- if (sparse) {
++ switch (mode) {
++ case SPARSE_READ_MODE_SPARSE:
+ return sparse_file_read_sparse(s, fd, crc);
+- } else {
++ case SPARSE_READ_MODE_NORMAL:
+ return sparse_file_read_normal(s, fd);
++ case SPARSE_READ_MODE_HOLE:
++ return sparse_file_read_hole(s, fd);
++ default:
++ return -EINVAL;
+ }
+ }
+
+--
+2.35.1.1320.gc452695387.dirty
+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
new file mode 100644
index 0000000000..9d19f58095
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
@@ -0,0 +1,114 @@
+From 00cce57eff1a0de3b93efa5da225e9eb33d19659 Mon Sep 17 00:00:00 2001
+From: Sean Anderson <sean.anderson@...>
+Date: Thu, 30 Dec 2021 15:34:28 -0500
+Subject: [PATCH] img2simg: Add support for converting holes to "don't care"
+ chunks
+
+This adds support for converting files with holes to "don't care"
+chunks. This can result in a substantial reduction in the time it takes
+to program an image if it has many holes.
+
+Generally, constants compared to argc have been reduced by one, since we
+no longer have the program name as the first argument.
+
+Change-Id: I00750edc07d6415dcc07ae0351e9397b0222b7ba
+Upstream-Status: Backport [6150b00b6025918da8c28e5c2f929ecdf480a9d6]
+Signed-off-by: Sean Anderson <sean.anderson@...>
+---
+ libsparse/img2simg.c | 41 ++++++++++++++++++++++++++++++-----------
+ 1 file changed, 30 insertions(+), 11 deletions(-)
+
+diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c
+index 2e171b613..c985d5449 100644
+--- a/libsparse/img2simg.c
++++ b/libsparse/img2simg.c
+@@ -40,25 +40,42 @@
+
+ void usage()
+ {
+- fprintf(stderr, "Usage: img2simg <raw_image_file> <sparse_image_file> [<block_size>]\n");
++ fprintf(stderr, "Usage: img2simg [-s] <raw_image_file> <sparse_image_file> [<block_size>]\n");
+ }
+
+ int main(int argc, char *argv[])
+ {
++ char *arg_in;
++ char *arg_out;
++ enum sparse_read_mode mode = SPARSE_READ_MODE_NORMAL;
++ int extra;
+ int in;
++ int opt;
+ int out;
+ int ret;
+ struct sparse_file *s;
+ unsigned int block_size = 4096;
+ off64_t len;
+
+- if (argc < 3 || argc > 4) {
++ while ((opt = getopt(argc, argv, "s")) != -1) {
++ switch (opt) {
++ case 's':
++ mode = SPARSE_READ_MODE_HOLE;
++ break;
++ default:
++ usage();
++ exit(-1);
++ }
++ }
++
++ extra = argc - optind;
++ if (extra < 2 || extra > 3) {
+ usage();
+ exit(-1);
+ }
+
+- if (argc == 4) {
+- block_size = atoi(argv[3]);
++ if (extra == 3) {
++ block_size = atoi(argv[optind + 2]);
+ }
+
+ if (block_size < 1024 || block_size % 4 != 0) {
+@@ -66,22 +83,24 @@ int main(int argc, char *argv[])
+ exit(-1);
+ }
+
+- if (strcmp(argv[1], "-") == 0) {
++ arg_in = argv[optind];
++ if (strcmp(arg_in, "-") == 0) {
+ in = STDIN_FILENO;
+ } else {
+- in = open(argv[1], O_RDONLY | O_BINARY);
++ in = open(arg_in, O_RDONLY | O_BINARY);
+ if (in < 0) {
+- fprintf(stderr, "Cannot open input file %s\n", argv[1]);
++ fprintf(stderr, "Cannot open input file %s\n", arg_in);
+ exit(-1);
+ }
+ }
+
+- if (strcmp(argv[2], "-") == 0) {
++ arg_out = argv[optind + 1];
++ if (strcmp(arg_out, "-") == 0) {
+ out = STDOUT_FILENO;
+ } else {
+- out = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
++ out = open(arg_out, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
+ if (out < 0) {
+- fprintf(stderr, "Cannot open output file %s\n", argv[2]);
++ fprintf(stderr, "Cannot open output file %s\n", arg_out);
+ exit(-1);
+ }
+ }
+@@ -96,7 +115,7 @@ int main(int argc, char *argv[])
+ }
+
+ sparse_file_verbose(s);
+- ret = sparse_file_read(s, in, SPARSE_READ_MODE_NORMAL, false);
++ ret = sparse_file_read(s, in, mode, false);
+ if (ret) {
+ fprintf(stderr, "Failed to read file\n");
+ exit(-1);
+--
+2.35.1.1320.gc452695387.dirty
+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 8f28abbd19..26393605d4 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -41,6 +41,9 @@ SRC_URI = " \
file://core/adb_libssl_11.diff;patchdir=system/core \
file://core/0013-adb-Support-riscv64.patch;patchdir=system/core \
file://core/0014-add-u3-ss-descriptor-support-for-adb.patch;patchdir=system/core \
+ file://core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch;patchdir=system/core \
+ file://core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch;patchdir=system/core \
+ file://core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch;patchdir=system/core \
file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \
file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \
file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \
--
2.35.1.1320.gc452695387.dirty

If the source image's size is not aligned to the sparse image's block
size, then conversion will fail with

img2simg: libsparse/sparse.cpp:133: int write_all_blocks(sparse_file*, output_file*): Assertion `pad >= 0' failed.

This is a bug in img2simg, but an easy way to work around it is to pad
the source image ourselves. The default block size of 4096 matches
img2simg's default block size.

Signed-off-by: Sean Anderson <sean.anderson@...>
---

Changes in v2:
- New

meta-oe/classes/image_types_sparse.bbclass | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta-oe/classes/image_types_sparse.bbclass b/meta-oe/classes/image_types_sparse.bbclass
index 4263593a8d..58221888ed 100644
--- a/meta-oe/classes/image_types_sparse.bbclass
+++ b/meta-oe/classes/image_types_sparse.bbclass
@@ -1,8 +1,17 @@
inherit image_types

+# This sets the granularity of the sparse image conversion. Chunk sizes will be
+# specified in units of this value. Setting this value smaller than the
+# underlying image's block size will not result in any further space saving.
+# However, there is no loss in correctness if this value is larger or smaller
+# than optimal. This value should be a power of two.
+SPARSE_BLOCK_SIZE ??= "4096"
+
+convert_sparse() {
+ truncate --no-create --size=%${SPARSE_BLOCK_SIZE} "$1"
+ img2simg "$1" "$1.sparse" ${SPARSE_BLOCK_SIZE}
+}
+
CONVERSIONTYPES += "sparse"
-CONVERSION_CMD:sparse = " \
- img2simg "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" \
- "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" \
-"
+CONVERSION_CMD:sparse = "convert_sparse '${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}'"
CONVERSION_DEPENDS_sparse = "android-tools-native"
--
2.35.1.1320.gc452695387.dirty

The upstream repo location has changed, it's now
https://git.enlightenment.org/old/legacy-imlib2

It's not clear when or why it happened, but the the commit hash we use
in SRCREV exists in the 'new' location, so let's at least update the
SRC_URI for now, and fix this warning:

WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL git://git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master, attempting MIRRORS if available

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@...>
Signed-off-by: Khem Raj <raj.khem@...>
(cherry picked from commit 62becef1091d21f487e826df7be7dcef3ab8f94c)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@...>
---
meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 56d41cd39..869f8123d 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package

AUTO_LIBNAME_PKGS = ""

-SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
S = "${WORKDIR}/git"

PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
--
2.36.0

The upstream repo location has changed, it's now
https://git.enlightenment.org/old/legacy-imlib2

It's not clear when or why it happened, but the the commit hash we use
in SRCREV exists in the 'new' location, so let's at least update the
SRC_URI for now, and fix this warning:

WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL git://git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master, attempting MIRRORS if available

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@...>
Signed-off-by: Khem Raj <raj.khem@...>
(cherry picked from commit 62becef1091d21f487e826df7be7dcef3ab8f94c)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@...>
---
meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 56d41cd39..869f8123d 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package

AUTO_LIBNAME_PKGS = ""

-SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
S = "${WORKDIR}/git"

PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
--
2.36.0

On 5/16/22 8:57 AM, Ross Burton wrote:

So this breaks silently because we don't yet check build dependencies when doing the build, which I'm working on.
The recipe is missing a dependency on setuptools-scm, and our setuptools recipe needs an upgrade.
Definitely revert this until those are fixed.

reverted.

Ross

On 5/16/22 8:28 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:

2022. 05. 10. 11:28 keltezéssel, Nicolas Dechesne írta:

The upstream repo location has changed, it's now
https://git.enlightenment.org/old/legacy-imlib2

This hits every branch in meta-openembedded, not only master.

A different patch fixing same thing is already in master.

It's not clear when or why it happened, but the the commit hash we use
in SRCREV exists in the 'new' location, so let's at least update the
SRC_URI for now, and fix this warning:

WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL git://git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master, attempting MIRRORS if available

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@...>
---
  meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 56d41cd39..869f8123d 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package
  AUTO_LIBNAME_PKGS = ""
-SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
  S = "${WORKDIR}/git"
  PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"

This build is broken and doesn't generate any files: it is missing a
DEPENDS on python3-setuptools-scm-native, and our setuptools recipe
isn't new enough to build this version.

This reverts commit 1e050deca1977906b510516cb2d48f65cfc3056f.

Signed-off-by: Ross Burton <ross.burton@...>
---
.../python/{python3-cbor2_5.4.3.bb =3D> python3-cbor2_5.4.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-cbor2_5.4.3.bb =3D> =
python3-cbor2_5.4.2.bb} (88%)

diff --git a/meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb b=
/meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb
similarity index 88%
rename from meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb
rename to meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb
index 0890b99c08..cafc32ad10 100644
--- a/meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb
+++ b/meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb
@@ -4,7 +4,7 @@ DEPENDS +=3D"${PYTHON_PN}-setuptools-scm-native"
LICENSE =3D "Apache-2.0"
LIC_FILES_CHKSUM =3D "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=3D89ae=
a4e17d99a7cacdbeed46a0096b10"
=20
-SRC_URI[sha256sum] =3D "62b863c5ee6ced4032afe948f3c1484f375550995d3b8498=
145237fe28e546c2"
+SRC_URI[sha256sum] =3D "e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664=
c69e639135e6b3b8"
=20
inherit pypi python_setuptools_build_meta ptest
=20
--=20
2.25.1