Date   

[PATCH 2/2] python3-poetry-core: self-bootstrap

Ross Burton <ross@...>
 

Poetry can bootstrap itself, so just inherit poetry_core.

Signed-off-by: Ross Burton <ross.burton@...>
---
.../python/python3-poetry-core_1.0.8.bb | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.=
8.bb b/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb
index 8ac9ed2be3..99ec763c4d 100644
--- a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb
+++ b/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb
@@ -21,7 +21,8 @@ LIC_FILES_CHKSUM =3D "file://LICENSE;md5=3D104d5c3c653a=
eededf4076773aa4c236 \
=20
SRC_URI[sha256sum] =3D "951fc7c1f8d710a94cb49019ee3742125039fc659675912e=
a614ac2aa405b118"
=20
-inherit pip_install_wheel python3native python3-dir pypi setuptools3-bas=
e
+inherit poetry_core pypi
+
PIP_INSTALL_PACKAGE =3D "poetry_core"
=20
RDEPENDS:${PN}:append:class-target =3D "\
@@ -42,16 +43,4 @@ RDEPENDS:${PN} +=3D "\
python3-six \
"
=20
-do_configure () {
- mkdir -p ${B}/dist
- cat > ${B}/build-it.py << EOF
-from poetry.core.masonry import api
-api.build_wheel('${B}/dist')
-EOF=20
-}
-
-do_compile () {
- ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${B}/build=
-it.py
-}
-
BBCLASSEXTEND =3D "native nativesdk"
--=20
2.25.1


[PATCH 1/2] poetry-core: clean up class

Ross Burton <ross@...>
 

There's been a lot of work on this class so clean it up a bit.

Rationalise imports, python3-dir is already included in python3native.

Don't write a helper script in do_configure, just call the API in
do_compile. In the long term this should be using pypa/build instead
of calling the API directly.

Stub out do_configure as the base configure isn't useful.

Write the wheel to PIP_INSTALL_DIST_PATH instead of hard-coding S/dist,
and clean it.

Use EXPORT_FUNCTIONS on the tasks.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-python/classes/poetry_core.bbclass | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-python/classes/poetry_core.bbclass b/meta-python/classe=
s/poetry_core.bbclass
index 4b3f9631e2..fb37c78c78 100644
--- a/meta-python/classes/poetry_core.bbclass
+++ b/meta-python/classes/poetry_core.bbclass
@@ -1,15 +1,15 @@
-inherit pip_install_wheel python3native python3-dir setuptools3-base
+inherit pip_install_wheel python3native setuptools3-base
=20
-DEPENDS +=3D "python3 python3-poetry-core-native python3-pip-native"
+DEPENDS +=3D "python3-poetry-core-native"
=20
-do_configure () {
- mkdir -p ${S}/dist
- cat > ${S}/build-it.py << EOF
-from poetry.core.masonry import api
-api.build_wheel('${S}/dist')
-EOF
+poetry_core_do_configure () {
+ :
}
=20
-do_compile () {
- ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${S}/build=
-it.py
+# TODO: ideally this uses pypa/build
+poetry_core_do_compile () {
+ nativepython3 -c "from poetry.core.masonry import api; api.build_whe=
el('${PIP_INSTALL_DIST_PATH}')"
}
+do_compile[cleandirs] +=3D "${PIP_INSTALL_DIST_PATH}"
+
+EXPORT_FUNCTIONS do_configure do_compile
--=20
2.25.1


Re: [meta-oe][PATCH v2] nodejs: add option to use openssl legacy providers again

Khem Raj
 

On Sat, Mar 5, 2022 at 11:47 AM akuster808 <akuster808@...> wrote:



On 3/5/22 05:16, Andrej Valek wrote:
Current nodejs version v16 does not fully support new OpenSSL, so add option
to use legacy provider.

| opensslErrorStack: [ 'error:03000086:digital envelope routines::initialization error' ],
| library: 'digital envelope routines',
| reason: 'unsupported',
| code: 'ERR_OSSL_EVP_UNSUPPORTED'

It was blindly removed by upgrade to 16.14.0 version

Signed-off-by: Andrej Valek <andrej.valek@...>
---
...5-add-openssl-legacy-provider-option.patch | 151 ++++++++++++++++++
.../recipes-devtools/nodejs/nodejs_16.14.0.bb | 1 +
2 files changed, 152 insertions(+)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch
new file mode 100644
index 000000000..5af6c6114
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch
@@ -0,0 +1,151 @@
+From 86d1c0cc6a5dcf57e413a1cc1c29203e87cf9a14 Mon Sep 17 00:00:00 2001
+From: Daniel Bevenius <daniel.bevenius@...>
+Date: Sat, 16 Oct 2021 08:50:16 +0200
+Subject: [PATCH] src: add --openssl-legacy-provider option
+
+This commit adds an option to Node.js named --openssl-legacy-provider
+and if specified will load OpenSSL 3.0 Legacy provider.
+
+$ ./node --help
+...
+--openssl-legacy-provider enable OpenSSL 3.0 legacy provider
+
+Example usage:
+
+$ ./node --openssl-legacy-provider -p 'crypto.createHash("md4")'
+Hash {
+ _options: undefined,
+ [Symbol(kHandle)]: Hash {},
+ [Symbol(kState)]: { [Symbol(kFinalized)]: false }
+}
+
+Co-authored-by: Richard Lau <rlau@...>
+
+Refs: https://github.com/nodejs/node/issues/40455
The patch is self is missing:

Signed-off-by: "you"
Upstream-Status: (see
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines)
right, this time I have addressed this myself for once.


+---
+ doc/api/cli.md | 10 ++++++++++
+ src/crypto/crypto_util.cc | 10 ++++++++++
+ src/node_options.cc | 10 ++++++++++
+ src/node_options.h | 7 +++++++
+ .../test-process-env-allowed-flags-are-documented.js | 5 +++++
+ 5 files changed, 42 insertions(+)
+
+diff --git a/doc/api/cli.md b/doc/api/cli.md
+index 74057706bf8d..608b9cdeddf1 100644
+--- a/doc/api/cli.md
++++ b/doc/api/cli.md
+@@ -687,6 +687,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be
+ used to enable FIPS-compliant crypto if Node.js is built
+ against FIPS-enabled OpenSSL.
+
++### `--openssl-legacy-provider`
++<!-- YAML
++added: REPLACEME
++-->
++
++Enable OpenSSL 3.0 legacy provider. For more information please see
++[providers readme][].
++
+ ### `--pending-deprecation`
+
+ <!-- YAML
+@@ -1544,6 +1552,7 @@ Node.js options that are allowed are:
+ * `--no-warnings`
+ * `--node-memory-debug`
+ * `--openssl-config`
++* `--openssl-legacy-provider`
+ * `--pending-deprecation`
+ * `--policy-integrity`
+ * `--preserve-symlinks-main`
+@@ -1933,6 +1942,7 @@ $ node --max-old-space-size=1536 index.js
+ [emit_warning]: process.md#processemitwarningwarning-options
+ [jitless]: https://v8.dev/blog/jitless
+ [libuv threadpool documentation]: https://docs.libuv.org/en/latest/threadpool.html
++[providers readme]: https://github.com/openssl/openssl/blob/openssl-3.0.0/README-PROVIDERS.md
+ [remote code execution]: https://www.owasp.org/index.php/Code_Injection
+ [security warning]: #warning-binding-inspector-to-a-public-ipport-combination-is-insecure
+ [timezone IDs]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
+index 7e0c8ba3eb60..796ea3025e41 100644
+--- a/src/crypto/crypto_util.cc
++++ b/src/crypto/crypto_util.cc
+@@ -148,6 +148,16 @@ void InitCryptoOnce() {
+ }
+ #endif
+
++#if OPENSSL_VERSION_MAJOR >= 3
++ // --openssl-legacy-provider
++ if (per_process::cli_options->openssl_legacy_provider) {
++ OSSL_PROVIDER* legacy_provider = OSSL_PROVIDER_load(nullptr, "legacy");
++ if (legacy_provider == nullptr) {
++ fprintf(stderr, "Unable to load legacy provider.\n");
++ }
++ }
++#endif
++
+ OPENSSL_init_ssl(0, settings);
+ OPENSSL_INIT_free(settings);
+ settings = nullptr;
+diff --git a/src/node_options.cc b/src/node_options.cc
+index 00bdc6688a4c..3363860919a9 100644
+--- a/src/node_options.cc
++++ b/src/node_options.cc
+@@ -4,6 +4,9 @@
+ #include "env-inl.h"
+ #include "node_binding.h"
+ #include "node_internals.h"
++#if HAVE_OPENSSL
++#include "openssl/opensslv.h"
++#endif
+
+ #include <errno.h>
+ #include <sstream>
+diff --git a/src/node_options.h b/src/node_options.h
+index fd772478d04d..1c0e018ab16f 100644
+--- a/src/node_options.h
++++ b/src/node_options.h
+@@ -11,6 +11,10 @@
+ #include "node_mutex.h"
+ #include "util.h"
+
++#if HAVE_OPENSSL
++#include "openssl/opensslv.h"
++#endif
++
+ namespace node {
+
+ class HostPort {
+@@ -251,6 +255,9 @@ class PerProcessOptions : public Options {
+ bool enable_fips_crypto = false;
+ bool force_fips_crypto = false;
+ #endif
++#if OPENSSL_VERSION_MAJOR >= 3
++ bool openssl_legacy_provider = false;
++#endif
+
+ // Per-process because reports can be triggered outside a known V8 context.
+ bool report_on_fatalerror = false;
+diff --git a/test/parallel/test-process-env-allowed-flags-are-documented.js b/test/parallel/test-process-env-allowed-flags-are-documented.js
+index 64626b71f019..8a4e35997907 100644
+--- a/test/parallel/test-process-env-allowed-flags-are-documented.js
++++ b/test/parallel/test-process-env-allowed-flags-are-documented.js
+@@ -43,6 +43,10 @@ for (const line of [...nodeOptionsLines, ...v8OptionsLines]) {
+ }
+ }
+
++if (!common.hasOpenSSL3) {
++ documented.delete('--openssl-legacy-provider');
++}
++
+ // Filter out options that are conditionally present.
+ const conditionalOpts = [
+ {
+@@ -50,6 +54,7 @@ const conditionalOpts = [
+ filter: (opt) => {
+ return [
+ '--openssl-config',
++ common.hasOpenSSL3 ? '--openssl-legacy-provider' : '',
+ '--tls-cipher-list',
+ '--use-bundled-ca',
+ '--use-openssl-ca',
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb
index 9514ec499..7b9644ec8 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb
@@ -20,6 +20,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
file://0002-Install-both-binaries-and-use-libdir.patch \
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
+ file://0005-add-openssl-legacy-provider-option.patch \
file://big-endian.patch \
file://mips-less-memory.patch \
file://system-c-ares.patch \



Re: [meta-zephyr][PATCH 2/2] zephyr-kernel: add support for zephyr v3.0.0

Jon Mason
 

On Tue, Mar 08, 2022 at 11:12:00AM +0100, Bartosz Golaszewski wrote:
From: Bartosz Golaszewski <bartosz.golaszewski@...>

Add support for zephyr v3.0.0 and make it the preferred version.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@...>
Ran this patch through my nightly CI and it comes out green
https://gitlab.com/jonmason00/meta-zephyr/-/pipelines/487255541

Tested-by: Jon Mason <jon.mason@...>

---
.../zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 16 ++---
.../zephyr-kernel/zephyr-kernel-src-3.0.0.inc | 70 +++++++++++++++++++
.../zephyr-kernel/zephyr-kernel-src.inc | 12 ++--
3 files changed, 83 insertions(+), 15 deletions(-)
create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
index e090234..a2c100c 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
@@ -2,11 +2,11 @@ SRCREV_FORMAT = "default_cmsis"

# These repositories are specific to post-2.6 branches

-SRC_URI += "\
- git://github.com/zephyrproject-rtos/hal_telink.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/telink;name=telink \
- git://github.com/zephyrproject-rtos/lz4.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/lz4;name=lz4 \
- git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \
- "
+SRC_URI += " \
+ git://github.com/zephyrproject-rtos/mcumgr.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/mcumgr;name=mcumgr \
+ git://github.com/zephyrproject-rtos/TraceRecorderSource.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorder \
+ git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;nobranch=1;destsuffix=git/modules/tee/tfm;name=tfm \
+"

#
# Generated from:
@@ -62,8 +62,4 @@ SRCREV_tfm = "c74be3890c9d975976fde1b1a3b2f5742bec34c0"
ZEPHYR_BRANCH = "v2.7-branch"
PV = "2.7.1+git${SRCPV}"

-SRC_URI:append = " \
- file://0001-cmake-add-yocto-toolchain.patch \
- file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
- file://dtc.patch \
-"
+SRC_URI:append = " file://dtc.patch"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
new file mode 100644
index 0000000..64594a0
--- /dev/null
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
@@ -0,0 +1,70 @@
+SRCREV_FORMAT = "default_cmsis"
+
+#
+# Generated with:
+#
+# #!/usr/bin/python3
+#
+# import yaml
+# import sys
+#
+# if __name__ == "__main__":
+# with open(sys.argv[1], "r") as fd:
+# data = yaml.safe_load(fd)
+#
+# for project in data["manifest"]["projects"]:
+# print("SRCREV_{} = \"{}\"".format(project["name"], project["revision"]))
+#
+
+SRCREV_default = "4f8d78ceeb436e82f528511998515f6fc137c6cd"
+SRCREV_canopennode = "1052dae561497bef901f931ef75e117c9224aecd"
+SRCREV_civetweb = "094aeb41bb93e9199d24d665ee43e9e05d6d7b1c"
+SRCREV_cmsis = "b0612c97c1401feeb4160add6462c3627fe90fc7"
+SRCREV_edtt = "1fc2e6f7d2a01a01074456f2ef2ccf1f3df7fac1"
+SRCREV_fatfs = "09a9d913c61dccbb8ff92d8943b452c614ac5292"
+SRCREV_fff = "6ce5ba26486e93d5b7696a3e23f0585932c14b16"
+SRCREV_altera = "23c1c1dd7a0c1cc9a399509d1819375847c95b97"
+SRCREV_atmel = "9f78f520f6cbb997e5b44fe8ab17dd5bf2448095"
+SRCREV_cypress = "81a059f21435bc7e315bccd720da5a9b615bbb50"
+SRCREV_espressif = "bcd7565ffa390d5774dc2fbe71a002faa9a7d082"
+SRCREV_gigadevice = "242a7f4be7a3136606c7a65169775f7ef85ad444"
+SRCREV_infineon = "f1fa8241f8786198ba41155413243de36ed878a5"
+SRCREV_microchip = "870d05e6a64ea9548da6b907058b03c8c9420826"
+SRCREV_nordic = "a42b016d7c7610489f5f8c79773fedc05ba352ee"
+SRCREV_nuvoton = "b4d31f33238713a568e23618845702fadd67386f"
+SRCREV_nxp = "9629f15fd80169cc9669e3fbb1260467c3aeb175"
+SRCREV_openisa = "40d049f69c50b58ea20473bee14cf93f518bf262"
+SRCREV_quicklogic = "b3a66fe6d04d87fd1533a5c8de51d0599fcd08d0"
+SRCREV_rpi_pico = "191f5ba46fda49523cdaaef27583d1c875ba2c36"
+SRCREV_silabs = "be39d4eebeddac6e18e9c0c3ba1b31ad1e82eaed"
+SRCREV_st = "575de9d461aa6f430cf62c58a053675377e700f3"
+SRCREV_stm32 = "300109f80730cb2477bfcc706a6602b9870336b3"
+SRCREV_telink = "ffcfd6282aa213f1dc0848dbca6279b098f6b143"
+SRCREV_ti = "1992a4c536554c4f409c36896eda6abdc414d277"
+SRCREV_xtensa = "0e577021bb66e644afd067cd9f7c71ab11b62b3d"
+SRCREV_libmetal = "f237c9d420a51cc43bc37d744e41191ad613f348"
+SRCREV_littlefs = "33509ed9c3d369cdb9d909cd40c5eea8f64a902c"
+SRCREV_loramac-node = "12019623bbad9eb54fe51066847a7cbd4b4eac57"
+SRCREV_lvgl = "783c1f78c8e39751fe89d0883c8bce7336f55e94"
+SRCREV_lz4 = "8e303c264fc21c2116dc612658003a22e933124d"
+SRCREV_mbedtls = "3e3e58a92de76069730c63e0d524f40fea948a61"
+SRCREV_mcuboot = "89936c338e46f43cb177a8b928cd80b90f3ace8f"
+SRCREV_mipi-sys-t = "d9da086b11cda494d85f4d8a9829f505c2d5e380"
+SRCREV_nanopb = "d148bd26718e4c10414f07a7eb1bd24c62e56c5d"
+SRCREV_net-tools = "f49bd1354616fae4093bf36e5eaee43c51a55127"
+SRCREV_nrf_hw_models = "b8cea37dbdc8fc58cc14b4e19fa850877a9da520"
+SRCREV_open-amp = "cfd050ff38a9d028dc211690b2ec35971128e45e"
+SRCREV_openthread = "b7aa7686d3f4e326bd25abc234b209159977c26d"
+SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6"
+SRCREV_sof = "500d77e0ac84ac2c969e0d4b2142cca192e893bc"
+SRCREV_tflite-micro = "9156d050927012da87079064db59d07f03b8baf6"
+SRCREV_tinycbor = "40daca97b478989884bffb5226e9ab73ca54b8c4"
+SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"
+SRCREV_TraceRecorderSource = "e8ca3b6a83d19b2fc4738a0d9607190436e5e452"
+SRCREV_trusted-firmware-m = "5d32c3e64b3d589548e881eeeeb37d84944c90af"
+SRCREV_tf-m-tests = "52814181f0fde6d1422fac204d42cde30c62e40e"
+SRCREV_psa-arch-tests = "0aab24602cbef30f6422e7ef1066a8473073e586"
+SRCREV_zscilib = "12bfe3f0a9fcbfe3edab7eabc9678b6c62875d34"
+
+ZEPHYR_BRANCH = "v3.0-branch"
+PV = "3.0.0+git${SRCPV}"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
index 60291ed..9a92ddf 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
@@ -37,7 +37,6 @@ SRC_URI = "\
git://github.com/zephyrproject-rtos/lvgl.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/gui/lvgl;name=lvgl \
git://github.com/zephyrproject-rtos/mbedtls.git;protocol=https;nobranch=1;destsuffix=git/modules/crypto/mbedtls;name=mbedtls \
git://github.com/zephyrproject-rtos/mcuboot.git;protocol=https;nobranch=1;destsuffix=git/bootloader/mcuboot;name=mcuboot \
- git://github.com/zephyrproject-rtos/mcumgr.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/mcumgr;name=mcumgr \
git://github.com/zephyrproject-rtos/mipi-sys-t.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/mipi-sys-t;name=mipi-sys-t \
git://github.com/zephyrproject-rtos/nanopb.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/nanopb;name=nanopb \
git://github.com/zephyrproject-rtos/net-tools.git;protocol=https;nobranch=1;destsuffix=git/tools/net-tools;name=net-tools \
@@ -48,11 +47,14 @@ SRC_URI = "\
git://github.com/zephyrproject-rtos/sof.git;protocol=https;nobranch=1;destsuffix=git/modules/audio/sof;name=sof \
git://github.com/zephyrproject-rtos/tinycbor.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tinycbor;name=tinycbor \
git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;nobranch=1;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \
- git://github.com/zephyrproject-rtos/TraceRecorderSource.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorder \
- git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;nobranch=1;destsuffix=git/modules/tee/tfm;name=tfm \
- "
+ git://github.com/zephyrproject-rtos/hal_telink.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/telink;name=telink \
+ git://github.com/zephyrproject-rtos/lz4.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/lz4;name=lz4 \
+ git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \
+ file://0001-cmake-add-yocto-toolchain.patch \
+ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
+"
S = "${WORKDIR}/git"

# Default to a stable version
-PREFERRED_VERSION_zephyr-kernel ??= "2.7.1"
+PREFERRED_VERSION_zephyr-kernel ??= "3.0.0"
include zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc
--
2.30.1


Re: [meta-oe][PATCH] libiio: point PYPA_WHEEL to custom location

Khem Raj
 

Ok, thanks.

On Tue, Mar 8, 2022 at 3:38 AM Sam Van Den Berge
<sam.van.den.berge@...> wrote:

On Sat, Mar 05, 2022 at 11:29:42PM -0800, Khem Raj wrote:
Thanks for fixing this

On Sat, Mar 5, 2022 at 10:31 PM Sam Van Den Berge
<sam.van.den.berge@...> wrote:

From: Sam Van Den Berge <sam.van.den.berge@...>

This fixes the installation of the python bindings of libiio.

Signed-off-by: Sam Van Den Berge <sam.van.den.berge@...>
---
meta-oe/recipes-support/libiio/libiio_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb
index f33fc0c1c..19753a13b 100644
--- a/meta-oe/recipes-support/libiio/libiio_git.bb
+++ b/meta-oe/recipes-support/libiio/libiio_git.bb
@@ -15,6 +15,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"

SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/"
+PIP_INSTALL_PACKAGE = "libiio"
+PIP_INSTALL_DIST_PATH = "${B}/bindings/python/dist/"
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.21-*.whl"
perhaps we do not need to set PYPA_WHEEL perhaps. I am also wondering
why its not failing in
oe world builds. Can you check it again with latest master-next of
both core and meta-oe
Thanks for the hint.

Tried today with latest master and it worked without my patch. I guess commit
6f2d85a7b7d9 in oe-core fixes some things so this patch can be dropped.


DEPENDS = " \
flex-native bison-native libaio \
--
2.25.1




[meta-oe][PATCH 3/3] libsdl2-ttf: Change depenendency from virtual/libgl to virtual/egl

Khem Raj
 

Fixes build on graphics drivers not providing GL implementation

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb
index 513b411448..0951d721ba 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb
@@ -1,6 +1,6 @@
SUMMARY = "Simple DirectMedia Layer truetype font library"
SECTION = "libs"
-DEPENDS = "virtual/libsdl2 freetype virtual/libgl"
+DEPENDS = "virtual/libsdl2 freetype virtual/egl"
LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87"

--
2.35.1


[meta-oe][PATCH 2/3] boinc-client: Depend on virtual/egl instead of virtual/libgl

Khem Raj
 

virtual/libgl points to GL implementation but some implementations of
graphics drivers may only provide GLES and this makes the package build
on such architectures

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
index 63c32dbf0e..5e991d3099 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
@@ -24,7 +24,7 @@ DEPENDS = "curl \
jpeg \
openssl \
sqlite3 \
- virtual/libgl \
+ virtual/egl \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libnotify', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \
nettle \
--
2.35.1


[meta-multimedia][PATCH 1/3] libdc1394: Change dependency from virtual/libgl to virtual/egl

Khem Raj
 

virtual/libgl is not provided by some graphic stacks

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb
index d5e189dcb6..952ba603ba 100755
--- a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb
+++ b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64"
# libsdl to provide sdl.m4 with AM_PATH_SDL
DEPENDS += "libusb1 libraw1394 libsdl \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv virtual/libx11', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/egl', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'libglu', '', d)} \
"

--
2.35.1


[meta-oe][PATCH] libiio: update to version 0.23

Christian Eggers
 

- drop 0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch
(integrated upstream)
- new PACKAGECONFIG "xml_backend" (WITH_XML_BACKEND=off must be
explicitly provided if libxml2 is not available)
- new PACKAGECONFIG "dnssd" (HAVE_DNS_SD=off must be explicitly provided
if libavahi is not available)
- python library has been renamed (libiio --> pylibiio)

Signed-off-by: Christian Eggers <ceggers@...>
---
...rify-whether-libiio-is-installed-whe.patch | 34 -------------------
meta-oe/recipes-support/libiio/libiio_git.bb | 21 ++++++------
2 files changed, 10 insertions(+), 45 deletions(-)
delete mode 100644 meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch

diff --git a/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch b/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch
deleted file mode 100644
index 4d3dcd5cedd4..000000000000
--- a/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 717b0f46b23ddc042da481d1d446bdd1c6c49142 Mon Sep 17 00:00:00 2001
-From: Julien Malik <julien.malik@...>
-Date: Mon, 27 Jul 2020 14:34:44 +0200
-Subject: [PATCH] python: Do not verify whether libiio is installed when
- cross-compiling
-
-This should fix #561
-
-Signed-off-by: Julien Malik <julien.malik@...>
----
- bindings/python/setup.py.cmakein | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein
-index cd14e2e..96d58a8 100644
---- a/bindings/python/setup.py.cmakein
-+++ b/bindings/python/setup.py.cmakein
-@@ -54,6 +54,13 @@ class InstallWrapper(install):
- install.run(self)
-
- def _check_libiio_installed(self):
-+ cross_compiling = ("${CMAKE_CROSSCOMPILING}" == "TRUE")
-+ if cross_compiling:
-+ # When cross-compiling, we generally cannot dlopen
-+ # the libiio shared lib from the build platform.
-+ # Simply skip this check in that case.
-+ return
-+
- from platform import system as _system
- from ctypes import CDLL as _cdll
- from ctypes.util import find_library
---
-2.25.1
-
diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb
index 2c22838bbf21..918ab277481c 100644
--- a/meta-oe/recipes-support/libiio/libiio_git.bb
+++ b/meta-oe/recipes-support/libiio/libiio_git.bb
@@ -4,12 +4,10 @@ SECTION = "libs"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"

-SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7"
-PV = "0.21+git${SRCPV}"
+SRCREV = "92d6a35f3d8d721cda7d6fe664b435311dd368b4"
+PV = "0.23"

-SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master \
- file://0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch \
-"
+SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"

S = "${WORKDIR}/git"
@@ -28,16 +26,16 @@ EXTRA_OECMAKE = " \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \
"

-PACKAGECONFIG ??= "usb_backend network_backend serial_backend"
-
-NETWORK_BACKEND_DEPENDENCIES = "\
- libxml2 \
- ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
+PACKAGECONFIG ??= " \
+ usb_backend network_backend serial_backend xml_backend \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'dnssd', '', d)} \
"

PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2"
-PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF, ${NETWORK_BACKEND_DEPENDENCIES}"
+PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2"
PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2"
+PACKAGECONFIG[xml_backend] = "-DWITH_XML_BACKEND=ON,-DWITH_XML_BACKEND=off,libxml2"
+PACKAGECONFIG[dnssd] = "-DHAVE_DNS_SD=ON,-DHAVE_DNS_SD=off,avahi"
PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF"

PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}"
@@ -70,6 +68,7 @@ do_compile() {
cmake_do_compile
}

+PIP_INSTALL_PACKAGE = "pylibiio"
do_install() {
if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then
setuptools3_do_install
--
2.34.1


Re: [meta-oe][PATCH] libiio: point PYPA_WHEEL to custom location

Sam Van Den Berge
 

On Sat, Mar 05, 2022 at 11:29:42PM -0800, Khem Raj wrote:
Thanks for fixing this

On Sat, Mar 5, 2022 at 10:31 PM Sam Van Den Berge
<sam.van.den.berge@...> wrote:

From: Sam Van Den Berge <sam.van.den.berge@...>

This fixes the installation of the python bindings of libiio.

Signed-off-by: Sam Van Den Berge <sam.van.den.berge@...>
---
meta-oe/recipes-support/libiio/libiio_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb
index f33fc0c1c..19753a13b 100644
--- a/meta-oe/recipes-support/libiio/libiio_git.bb
+++ b/meta-oe/recipes-support/libiio/libiio_git.bb
@@ -15,6 +15,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"

SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/"
+PIP_INSTALL_PACKAGE = "libiio"
+PIP_INSTALL_DIST_PATH = "${B}/bindings/python/dist/"
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.21-*.whl"
perhaps we do not need to set PYPA_WHEEL perhaps. I am also wondering
why its not failing in
oe world builds. Can you check it again with latest master-next of
both core and meta-oe
Thanks for the hint.

Tried today with latest master and it worked without my patch. I guess commit
6f2d85a7b7d9 in oe-core fixes some things so this patch can be dropped.


DEPENDS = " \
flex-native bison-native libaio \
--
2.25.1




[meta-zephyr][PATCH 2/2] zephyr-kernel: add support for zephyr v3.0.0

Bartosz Golaszewski
 

From: Bartosz Golaszewski <bartosz.golaszewski@...>

Add support for zephyr v3.0.0 and make it the preferred version.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@...>
---
.../zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 16 ++---
.../zephyr-kernel/zephyr-kernel-src-3.0.0.inc | 70 +++++++++++++++++++
.../zephyr-kernel/zephyr-kernel-src.inc | 12 ++--
3 files changed, 83 insertions(+), 15 deletions(-)
create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
index e090234..a2c100c 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
@@ -2,11 +2,11 @@ SRCREV_FORMAT = "default_cmsis"

# These repositories are specific to post-2.6 branches

-SRC_URI += "\
- git://github.com/zephyrproject-rtos/hal_telink.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/telink;name=telink \
- git://github.com/zephyrproject-rtos/lz4.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/lz4;name=lz4 \
- git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \
- "
+SRC_URI += " \
+ git://github.com/zephyrproject-rtos/mcumgr.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/mcumgr;name=mcumgr \
+ git://github.com/zephyrproject-rtos/TraceRecorderSource.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorder \
+ git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;nobranch=1;destsuffix=git/modules/tee/tfm;name=tfm \
+"

#
# Generated from:
@@ -62,8 +62,4 @@ SRCREV_tfm = "c74be3890c9d975976fde1b1a3b2f5742bec34c0"
ZEPHYR_BRANCH = "v2.7-branch"
PV = "2.7.1+git${SRCPV}"

-SRC_URI:append = " \
- file://0001-cmake-add-yocto-toolchain.patch \
- file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
- file://dtc.patch \
-"
+SRC_URI:append = " file://dtc.patch"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
new file mode 100644
index 0000000..64594a0
--- /dev/null
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
@@ -0,0 +1,70 @@
+SRCREV_FORMAT = "default_cmsis"
+
+#
+# Generated with:
+#
+# #!/usr/bin/python3
+#
+# import yaml
+# import sys
+#
+# if __name__ == "__main__":
+# with open(sys.argv[1], "r") as fd:
+# data = yaml.safe_load(fd)
+#
+# for project in data["manifest"]["projects"]:
+# print("SRCREV_{} = \"{}\"".format(project["name"], project["revision"]))
+#
+
+SRCREV_default = "4f8d78ceeb436e82f528511998515f6fc137c6cd"
+SRCREV_canopennode = "1052dae561497bef901f931ef75e117c9224aecd"
+SRCREV_civetweb = "094aeb41bb93e9199d24d665ee43e9e05d6d7b1c"
+SRCREV_cmsis = "b0612c97c1401feeb4160add6462c3627fe90fc7"
+SRCREV_edtt = "1fc2e6f7d2a01a01074456f2ef2ccf1f3df7fac1"
+SRCREV_fatfs = "09a9d913c61dccbb8ff92d8943b452c614ac5292"
+SRCREV_fff = "6ce5ba26486e93d5b7696a3e23f0585932c14b16"
+SRCREV_altera = "23c1c1dd7a0c1cc9a399509d1819375847c95b97"
+SRCREV_atmel = "9f78f520f6cbb997e5b44fe8ab17dd5bf2448095"
+SRCREV_cypress = "81a059f21435bc7e315bccd720da5a9b615bbb50"
+SRCREV_espressif = "bcd7565ffa390d5774dc2fbe71a002faa9a7d082"
+SRCREV_gigadevice = "242a7f4be7a3136606c7a65169775f7ef85ad444"
+SRCREV_infineon = "f1fa8241f8786198ba41155413243de36ed878a5"
+SRCREV_microchip = "870d05e6a64ea9548da6b907058b03c8c9420826"
+SRCREV_nordic = "a42b016d7c7610489f5f8c79773fedc05ba352ee"
+SRCREV_nuvoton = "b4d31f33238713a568e23618845702fadd67386f"
+SRCREV_nxp = "9629f15fd80169cc9669e3fbb1260467c3aeb175"
+SRCREV_openisa = "40d049f69c50b58ea20473bee14cf93f518bf262"
+SRCREV_quicklogic = "b3a66fe6d04d87fd1533a5c8de51d0599fcd08d0"
+SRCREV_rpi_pico = "191f5ba46fda49523cdaaef27583d1c875ba2c36"
+SRCREV_silabs = "be39d4eebeddac6e18e9c0c3ba1b31ad1e82eaed"
+SRCREV_st = "575de9d461aa6f430cf62c58a053675377e700f3"
+SRCREV_stm32 = "300109f80730cb2477bfcc706a6602b9870336b3"
+SRCREV_telink = "ffcfd6282aa213f1dc0848dbca6279b098f6b143"
+SRCREV_ti = "1992a4c536554c4f409c36896eda6abdc414d277"
+SRCREV_xtensa = "0e577021bb66e644afd067cd9f7c71ab11b62b3d"
+SRCREV_libmetal = "f237c9d420a51cc43bc37d744e41191ad613f348"
+SRCREV_littlefs = "33509ed9c3d369cdb9d909cd40c5eea8f64a902c"
+SRCREV_loramac-node = "12019623bbad9eb54fe51066847a7cbd4b4eac57"
+SRCREV_lvgl = "783c1f78c8e39751fe89d0883c8bce7336f55e94"
+SRCREV_lz4 = "8e303c264fc21c2116dc612658003a22e933124d"
+SRCREV_mbedtls = "3e3e58a92de76069730c63e0d524f40fea948a61"
+SRCREV_mcuboot = "89936c338e46f43cb177a8b928cd80b90f3ace8f"
+SRCREV_mipi-sys-t = "d9da086b11cda494d85f4d8a9829f505c2d5e380"
+SRCREV_nanopb = "d148bd26718e4c10414f07a7eb1bd24c62e56c5d"
+SRCREV_net-tools = "f49bd1354616fae4093bf36e5eaee43c51a55127"
+SRCREV_nrf_hw_models = "b8cea37dbdc8fc58cc14b4e19fa850877a9da520"
+SRCREV_open-amp = "cfd050ff38a9d028dc211690b2ec35971128e45e"
+SRCREV_openthread = "b7aa7686d3f4e326bd25abc234b209159977c26d"
+SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6"
+SRCREV_sof = "500d77e0ac84ac2c969e0d4b2142cca192e893bc"
+SRCREV_tflite-micro = "9156d050927012da87079064db59d07f03b8baf6"
+SRCREV_tinycbor = "40daca97b478989884bffb5226e9ab73ca54b8c4"
+SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"
+SRCREV_TraceRecorderSource = "e8ca3b6a83d19b2fc4738a0d9607190436e5e452"
+SRCREV_trusted-firmware-m = "5d32c3e64b3d589548e881eeeeb37d84944c90af"
+SRCREV_tf-m-tests = "52814181f0fde6d1422fac204d42cde30c62e40e"
+SRCREV_psa-arch-tests = "0aab24602cbef30f6422e7ef1066a8473073e586"
+SRCREV_zscilib = "12bfe3f0a9fcbfe3edab7eabc9678b6c62875d34"
+
+ZEPHYR_BRANCH = "v3.0-branch"
+PV = "3.0.0+git${SRCPV}"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
index 60291ed..9a92ddf 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
@@ -37,7 +37,6 @@ SRC_URI = "\
git://github.com/zephyrproject-rtos/lvgl.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/gui/lvgl;name=lvgl \
git://github.com/zephyrproject-rtos/mbedtls.git;protocol=https;nobranch=1;destsuffix=git/modules/crypto/mbedtls;name=mbedtls \
git://github.com/zephyrproject-rtos/mcuboot.git;protocol=https;nobranch=1;destsuffix=git/bootloader/mcuboot;name=mcuboot \
- git://github.com/zephyrproject-rtos/mcumgr.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/mcumgr;name=mcumgr \
git://github.com/zephyrproject-rtos/mipi-sys-t.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/mipi-sys-t;name=mipi-sys-t \
git://github.com/zephyrproject-rtos/nanopb.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/nanopb;name=nanopb \
git://github.com/zephyrproject-rtos/net-tools.git;protocol=https;nobranch=1;destsuffix=git/tools/net-tools;name=net-tools \
@@ -48,11 +47,14 @@ SRC_URI = "\
git://github.com/zephyrproject-rtos/sof.git;protocol=https;nobranch=1;destsuffix=git/modules/audio/sof;name=sof \
git://github.com/zephyrproject-rtos/tinycbor.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tinycbor;name=tinycbor \
git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;nobranch=1;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \
- git://github.com/zephyrproject-rtos/TraceRecorderSource.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorder \
- git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;nobranch=1;destsuffix=git/modules/tee/tfm;name=tfm \
- "
+ git://github.com/zephyrproject-rtos/hal_telink.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/telink;name=telink \
+ git://github.com/zephyrproject-rtos/lz4.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/lz4;name=lz4 \
+ git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \
+ file://0001-cmake-add-yocto-toolchain.patch \
+ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
+"
S = "${WORKDIR}/git"

# Default to a stable version
-PREFERRED_VERSION_zephyr-kernel ??= "2.7.1"
+PREFERRED_VERSION_zephyr-kernel ??= "3.0.0"
include zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc
--
2.30.1


[meta-zephyr][PATCH 1/2] zephyr-kernel: drop support for zephyr v2.6.1

Bartosz Golaszewski
 

From: Bartosz Golaszewski <bartosz.golaszewski@...>

v2.7.1 is the LTS release and we'll be adding support fr v3.0.0 in the
subsequent patch. Drop support for v2.6.1.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@...>
---
.../zephyr-kernel/zephyr-kernel-src-2.6.1.inc | 54 -------------------
1 file changed, 54 deletions(-)
delete mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
deleted file mode 100644
index 5306196..0000000
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-SRCREV_FORMAT = "default_cmsis"
-SRCREV_default = "c8755e0b46bd9e171fae38adc1c614197b8ac2cd"
-SRCREV_cmsis = "c3bd2094f92d574377f7af2aec147ae181aa5f8e"
-SRCREV_atmel = "d17b7dd92d209b20bc1e15431d068edc29bf438d"
-SRCREV_altera = "23c1c1dd7a0c1cc9a399509d1819375847c95b97"
-SRCREV_canopennode = "468d350028a975b96563e58344de48281a0ab371"
-SRCREV_civetweb = "e6903b80c09d17cd1a8bb32e40080005558aad29"
-SRCREV_espressif = "22e757632677e3579e6f20bb9955fffb2e1b3e1c"
-SRCREV_fatfs = "1d1fcc725aa1cb3c32f366e0c53d7490d0fe1109"
-SRCREV_cypress = "81a059f21435bc7e315bccd720da5a9b615bbb50"
-SRCREV_infineon = "f1fa8241f8786198ba41155413243de36ed878a5"
-SRCREV_nordic = "574493fe29c79140df4827ab5d4a23df79d03681"
-SRCREV_openisa = "40d049f69c50b58ea20473bee14cf93f518bf262"
-SRCREV_nuvoton = "b4d31f33238713a568e23618845702fadd67386f"
-SRCREV_microchip = "b280eec5d3b1296b231117c1999bcd0269b6ecc4"
-SRCREV_silabs = "be39d4eebeddac6e18e9c0c3ba1b31ad1e82eaed"
-SRCREV_st = "b52fdbf4b62439be9fab9bb4bae9690a42d2fb14"
-SRCREV_stm32 = "f8ff8d25aa0a9e65948040c7b47ec67f3fa300df"
-SRCREV_ti = "3da6fae25fc44ec830fac4a92787b585ff55435e"
-SRCREV_libmetal = "39d049d4ae68e6f6d595fce7de1dcfc1024fb4eb"
-SRCREV_quicklogic = "b3a66fe6d04d87fd1533a5c8de51d0599fcd08d0"
-SRCREV_lvgl = "31acbaa36e9e74ab88ac81e3d21e7f1d00a71136"
-SRCREV_mbedtls = "5765cb7f75a9973ae9232d438e361a9d7bbc49e7"
-SRCREV_mcuboot = "2fce9769b191411d580bbc65b043956c2ae9307e"
-SRCREV_mcumgr = "5c5055f5a7565f8152d75fcecf07262928b4d56e"
-SRCREV_net-tools = "f49bd1354616fae4093bf36e5eaee43c51a55127"
-SRCREV_nxp = "0d11138724959e1162777d9206f841ccdf64348e"
-SRCREV_open-amp = "6010f0523cbc75f551d9256cf782f173177acdef"
-SRCREV_loramac-node = "2cee5f7295ff0ff804bf06fea5de006bc7cd121e"
-SRCREV_openthread = "385e19da1ae15f27872c2543b97276a42f102ead"
-SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6"
-SRCREV_sof = "779f28ed465c03899c8a7d4aaf399856f4e51158"
-SRCREV_tinycbor = "40daca97b478989884bffb5226e9ab73ca54b8c4"
-SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"
-SRCREV_littlefs = "9e4498d1c73009acd84bb36036ee5e2869112a6c"
-SRCREV_mipi-sys-t = "75e671550ac1acb502f315fe4952514dc73f7bfb"
-SRCREV_nrf_hw_models = "a47e326ca772ddd14cc3b9d4ca30a9ab44ecca16"
-SRCREV_TraceRecorder = "5b5f8d7adbf0e93a09087e8f5708f0eebb8b25bf"
-SRCREV_xtensa = "2f04b615cd5ad3a1b8abef33f9bdd10cc1990ed6"
-SRCREV_edtt = "7dd56fc100d79cc45c33d43e7401d1803e26f6e7"
-SRCREV_tfm = "e18b7a9b040b5b5324520388047c9e7d678447e6"
-SRCREV_tfm-mcuboot = "4aa516e7281fc6f9a2dce0b0efda9acc580fa254"
-SRCREV_nanopb = "d148bd26718e4c10414f07a7eb1bd24c62e56c5d"
-SRCREV_tensorflow = "dc70a45a7cc12c25726a32cd91b28be59e7bc596"
-
-ZEPHYR_BRANCH = "v2.6-branch"
-PV = "2.6.1+git${SRCPV}"
-
-SRC_URI:append = " \
- file://0001-cmake-add-yocto-toolchain.patch \
- file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
- file://arduino-nano-33-ble-storage-partition.patch \
- file://dtc.patch \
-"
--
2.30.1


[meta-oe][PATCH] redis: remove fuzz warning

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Fixes:
WARNING: lib32-redis-7.0-rc1-r0 do_patch: Fuzz detected:

Applying patch GNU_SOURCE.patch
patching file src/zmalloc.c
Hunk #1 succeeded at 32 with fuzz 2 (offset 4 lines).

Signed-off-by: Mingli Yu <mingli.yu@...>
---
.../redis/redis/GNU_SOURCE.patch | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
index 9a40d832f..12994da56 100644
--- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
+++ b/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
@@ -1,4 +1,7 @@
-Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
+From 18dc1457db8f66237e016b85a04dc50833c33c50 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Sat, 21 Dec 2019 12:09:51 -0800
+Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER

Fixes
| zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function)
@@ -7,11 +10,18 @@ Fixes

Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@...>
+
+---
+ src/zmalloc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/zmalloc.c b/src/zmalloc.c
+index ba03685..322304f 100644
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
-@@ -28,6 +28,7 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
+@@ -32,6 +32,7 @@
+ #include "config.h"
+ #include "solarisfixes.h"

+#define _GNU_SOURCE
#include <stdio.h>
--
2.25.1


[meta-python][PATCH] Revert "python3-ipy: drop recipe"

Kai Kang
 

From: Kai Kang <kai.kang@...>

This reverts commit df077258b61f20ec8fdf3978fa4a912d3a14eaf5.

Add python3-ipy back and inherit setuptools3-legacy.

Signed-off-by: Kai Kang <kai.kang@...>
---
.../packagegroups/packagegroup-meta-python.bb | 2 ++
.../python/python3-ipy/run-ptest | 3 ++
.../python/python3-ipy_1.01.bb | 32 +++++++++++++++++++
3 files changed, 37 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-ipy/run-ptest
create mode 100644 meta-python/recipes-devtools/python/python3-ipy_1.01.bb

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 670361598..9626231bb 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -189,6 +189,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
python3-intelhex \
python3-intervals \
python3-ipaddress \
+ python3-ipy \
python3-ipython \
python3-ipython-genutils \
python3-iso3166 \
@@ -498,6 +499,7 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\
python3-html2text-ptest \
python3-inflection-ptest \
python3-intervals-ptest \
+ python3-ipy-ptest \
python3-iso3166-ptest \
python3-jdcal-ptest \
python3-jinja2-ptest \
diff --git a/meta-python/recipes-devtools/python/python3-ipy/run-ptest b/meta-python/recipes-devtools/python/python3-ipy/run-ptest
new file mode 100644
index 000000000..b63c4de0d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-ipy/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-python/recipes-devtools/python/python3-ipy_1.01.bb b/meta-python/recipes-devtools/python/python3-ipy_1.01.bb
new file mode 100644
index 000000000..8e7b5b987
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-ipy_1.01.bb
@@ -0,0 +1,32 @@
+SUMMARY = "IPy - class and tools for handling of IPv4 and IPv6 addresses and networks"
+DESCRIPTION = "IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks \
+in a fashion similar to perl's Net::IP and friends. The IP class allows \
+a comfortable parsing and handling for most notations in use for IPv4 \
+and IPv6 Addresses and Networks."
+SECTION = "devel/python"
+HOMEPAGE = "https://github.com/autocracy/python-ipy"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6"
+
+SRC_URI[md5sum] = "d6cf83e7f418ebbd23324ba1c658b907"
+SRC_URI[sha256sum] = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"
+
+inherit pypi setuptools3_legacy ptest
+
+SRC_URI += " \
+ file://run-ptest \
+"
+
+RDEPENDS:${PN}-ptest += " \
+ ${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/test/
+ cp -rf ${S}/test/* ${D}${PTEST_PATH}/test
+}
+
+PYPI_PACKAGE = "IPy"
+
+BBCLASSEXTEND = "native"
--
2.17.1


[meta-networking][PATCH] networkmanager: fix installed-vs-shipped error

Kai Kang
 

From: Kai Kang <kai.kang@...>

Fix installed-vs-shipped error of networkmanager:

| ERROR: networkmanager-1.36.0-r0 do_package: QA Issue: networkmanager:
Files/directories were installed but not shipped in any package:
| /usr/lib/firewalld
| /usr/lib/firewalld/zones
| /usr/lib/firewalld/zones/nm-shared.xml
| Please set FILES such that these items are packaged. Alternatively if they
are unneeded, avoid installing them or delete them with in do_install.
| networkmanager: 3 installed and not shipped files. [installed-vs-shipped]

Signed-off-by: Kai Kang <kai.kang@...>
---
.../networkmanager/networkmanager_1.36.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb
index f6d1b6c38..0ab8cad21 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb
@@ -182,7 +182,7 @@ FILES:${PN}-dev += " \
FILES:${PN} += " \
${libexecdir} \
${libdir}/NetworkManager \
- ${libdir}/firewalld/zones \
+ ${nonarch_libdir}/firewalld/zones \
${nonarch_libdir}/NetworkManager/conf.d \
${nonarch_libdir}/NetworkManager/dispatcher.d \
${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
--
2.17.1


[meta-python][PATCH] python3-asyncinotify: add 2.0.2

Justin Bronder
 

Signed-off-by: Justin Bronder <jsbronder@...>
---
.../python/python3-asyncinotify_2.0.2.bb | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb

diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb
new file mode 100644
index 0000000000..2bf9192481
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb
@@ -0,0 +1,15 @@
+SUMMARY = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features"
+HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec941a1cd6616454970d03cb9c9e8f8"
+
+SRC_URI[sha256sum] = "867cc056d88fc07aa8b3d1dc5b9c3c911cdd6130a4df5f67beb1fdecfd37b164"
+
+inherit pypi setuptools3
+
+RDEPENDS:${PN} += " \
+ python3-asyncio \
+ python3-core \
+ python3-ctypes \
+ python3-io \
+"
--
2.35.1


[meta-python][PATCH 2/2] python3-pymodbus: add 2.5.3

Justin Bronder
 

Signed-off-by: Justin Bronder <jsbronder@...>
---
.../python/python3-pymodbus_2.5.3.bb | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb

diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb b/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb
new file mode 100644
index 0000000000..b628cadafe
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb
@@ -0,0 +1,34 @@
+SUMMARY = "A fully featured modbus protocol stack in python"
+HOMEPAGE = "https://github.com/riptideio/pymodbus/"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2c2223d66c7e674b40527b5a4c35bd76"
+DEPENDS += "python3-six-native"
+
+SRC_URI[sha256sum] = "5ef68c1a109bdb467c830ef003ef2db6494349a5248e4af946fe21c9eefe7e74"
+S = "${WORKDIR}/pymodbus-${PV}"
+
+inherit pypi setuptools3
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[repl] = ",,,python3-aiohttp python3-click python3-prompt-toolkit python3-pygments python3-pyserial-asyncio"
+PACKAGECONFIG[tornado] = ",,,python3-tornado"
+PACKAGECONFIG[twisted] = ",,,python3-twisted-conch"
+PACKAGECONFIG[redis] = ",,,python3-redis"
+PACKAGECONFIG[sql] = ",,,python3-sqlalchemy"
+
+RDEPENDS:${PN} += " \
+ python3-asyncio \
+ python3-core \
+ python3-io \
+ python3-json \
+ python3-logging \
+ python3-math \
+ python3-netserver \
+"
+
+RDEPENDS:${PN} += " \
+ python3-pyserial \
+ python3-six \
+"
+
+
--
2.35.1


[meta-python][PATCH 1/2] python3-pyserial-asyncio: add 0.6

Justin Bronder
 

Dependency of python3-pymodbus.

Signed-off-by: Justin Bronder <jsbronder@...>
---
.../python/python3-pyserial-asyncio_0.6.bb | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb

diff --git a/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb b/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb
new file mode 100644
index 0000000000..30ff62a7ed
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Python Serial Port Extension - Asynchronous I/O support"
+HOMEPAGE = "https://github.com/pyserial/pyserial-asyncio"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9a79418f241689e78034391d51162d24"
+
+SRC_URI[sha256sum] = "b6032923e05e9d75ec17a5af9a98429c46d2839adfaf80604d52e0faacd7a32f"
+
+inherit pypi setuptools3
+
+RDEPENDS:${PN} += "python3-asyncio python3-core python3-pyserial"
--
2.35.1


Re: [PATCH 1/2] python3-blivetgui: use setuptools_legacy

Khem Raj
 

Awesome, thanks!

On Mon, Mar 7, 2022 at 9:01 AM Ross Burton <ross@...> wrote:

Done and sent a v3 containing all of the patches in one series.

Ross

On Mon, 7 Mar 2022 at 16:42, Khem Raj <raj.khem@...> wrote:

Can you rebase this on master-next ?

On Mon, Mar 7, 2022 at 4:11 AM Ross Burton <ross@...> wrote:

The setup.py installs to arbitrary target paths, so can't use the new
bdist_wheel installation method.

Signed-off-by: Ross Burton <ross.burton@...>
---
.../recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
index 995fb49622..7c3af1a8be 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protoc
inherit features_check
REQUIRED_DISTRO_FEATURES = "x11 systemd"

-inherit setuptools3 python3native
+inherit setuptools3_legacy python3native

RDEPENDS:${PN} = "python3-pygobject python3 \
python3-blivet gtk+3 \
--
2.25.1




[meta-networking][PATCH] proftpd: update to 1.3.7c

Radovan Scasny
 

Signed-off-by: Radovan Scasny <radovan.scasny@...>
---
.../proftpd/{proftpd_1.3.7a.bb => proftpd_1.3.7c.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.7a.bb => proftpd_1.3.7c.bb} (99%)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb
similarity index 99%
rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb
rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb
index 32faeab4d..686f1e5cd 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"

-SRCREV = "715eadc1aa4f6b07d69f9d09558e9cb471e51d87"
+SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962"
BRANCH = "1.3.7"

SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \
--
2.20.1

4021 - 4040 of 99908