Update to poky/scarthgap

drop obsolete backports (already available in scarthgap):
- cpputest
- jemalloc
- nlohmann-json
- python3-pymodbus

move recipes to corresponding upstream layer(s):
- catch

update to latest versions:
- catch
- cppcheck

.oelint.cfg

@@ -1,6 +1,8 @@
 [oelint]
 suppress =
+    oelint.file.underscores
+    oelint.var.mandatoryvar.SRC_URI
     oelint.vars.homepageping
 quiet = True
 color = True
-release = kirkstone
+release = scarthgap

conf/layer.conf

@@ -13,4 +13,4 @@ BBFILE_PRIORITY_protos = "10"
 
 LAYERDEPENDS_protos = "core"
 LAYERVERSION_protos = "1"
-LAYERSERIES_COMPAT_protos = "dunfell kirkstone"
+LAYERSERIES_COMPAT_protos = "dunfell kirkstone scarthgap"

meta-protos/conf/layer.conf

@@ -0,0 +1,16 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-protos"
+BBFILE_PATTERN_meta-protos = "^${LAYERDIR}/"
+
+# enforce precedence over any other layer
+BBFILE_PRIORITY_meta-protos = "8"
+
+LAYERDEPENDS_meta-protos = "core"
+LAYERVERSION_meta-protos = "1"
+LAYERSERIES_COMPAT_meta-protos = "dunfell kirkstone scarthgap"

conf/templates/bblayers.conf.sample → meta-protos/conf/templates/default/bblayers.conf.sample

@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
     ${TOPDIR}/../meta-clang \
-    ${TOPDIR}/../meta-kf5 \
     ${TOPDIR}/../meta-kf6 \
     ${TOPDIR}/../meta-mingw \
     ${TOPDIR}/../meta-oe/meta-filesystems \
@@ -20,15 +19,16 @@ BBLAYERS ?= " \
     ${TOPDIR}/../meta-oe/meta-python \
     ${TOPDIR}/../meta-oe/meta-webserver \
     ${TOPDIR}/../meta-oe/meta-xfce \
-    ${TOPDIR}/../meta-protos \
-    ${TOPDIR}/../meta-protos/meta \
-    ${TOPDIR}/../meta-protos/meta-oe \
-    ${TOPDIR}/../meta-protos/meta-python \
     ${TOPDIR}/../meta-qt5 \
     ${TOPDIR}/../meta-qt6 \
+    ${TOPDIR}/../meta-security \
     ${TOPDIR}/../meta-selinux \
     ${TOPDIR}/../poky/meta \
     ${TOPDIR}/../poky/meta-poky \
     ${TOPDIR}/../poky/meta-yocto-bsp \
     ${TOPDIR}/../protos \
+    ${TOPDIR}/../protos/meta-protos \
+    ${TOPDIR}/../protos/meta-protos/meta \
+    ${TOPDIR}/../protos/meta-protos/meta-oe \
+    ${TOPDIR}/../protos/meta-protos/meta-python \
 "

meta-protos/meta-oe/conf/layer.conf

@@ -0,0 +1,15 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-oe"
+BBFILE_PATTERN_meta-oe = "^${LAYERDIR}/"
+
+# enforce layer precedence
+BBFILE_PRIORITY_meta-oe = "8"
+
+LAYERDEPENDS_meta-oe = "core"
+LAYERSERIES_COMPAT_meta-oe = "dunfell kirkstone scarthgap"

meta-protos/meta-oe/recipes-support/fmt/fmt_8.1.0.1.bb

@@ -0,0 +1,22 @@
+SUMMARY = "open-source formatting library for C++"
+DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams."
+AUTHOR = "Victor Zverovich"
+HOMEPAGE = "https://fmt.dev"
+BUGTRACKER = "https://github.com/fmtlib/fmt/issues"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b"
+
+BRANCH = "8.1.0-jh"
+
+SRC_URI = "git://github.com/jhnc-oss/fmt;protocol=https;branch=${BRANCH}"
+SRCREV = "1dcbdf896a8e1672cd9f189ffe3e2e0290ad0aa0"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+inherit ptest
+
+EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
+
+BBCLASSEXTEND = "native"
+

meta-protos/meta-oe/recipes-test/catch3/catch3.inc

@@ -0,0 +1,10 @@
+SUMMARY = "A modern, C++-native, test framework for unit-tests, TDD and BDD"
+DESCRIPTION = "Catch2 is mainly a unit testing framework for C++, but it also provides basic micro-benchmarking features, and simple BDD macros."
+AUTHOR = "Catch"
+HOMEPAGE = "https://github.com/catchorg/Catch2"
+BUGTRACKER = "https://github.com/catchorg/Catch2/issues"
+SECTION = "development"
+LICENSE = "BSL-1.0"
+
+CVE_PRODUCT = ""
+

meta-protos/meta-oe/recipes-test/catch3/catch3_3.7.1.bb

@@ -0,0 +1,19 @@
+require ${PN}.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
+
+SRC_URI = "git://github.com/catchorg/Catch2.git;protocol=https;nobranch=1"
+SRCREV = "fa43b77429ba76c462b1898d6cd2f2d7a9416b14"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+do_install:append() {
+    rm -rf ${D}${datadir}/Catch2
+}
+
+ALLOW_EMPTY:${PN} = "1"
+
+BBCLASSEXTEND = "native nativesdk"
+

meta-protos/meta-python/conf/layer.conf

@@ -0,0 +1,18 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*/*.bbappend \
+            ${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend \
+"
+
+BBFILE_COLLECTIONS += "python-layer"
+BBFILE_PATTERN_python-layer = "^${LAYERDIR}/"
+
+# enforce layer precedence
+BBFILE_PRIORITY_python-layer = "8"
+
+LAYERDEPENDS_python-layer = "core"
+LAYERSERIES_COMPAT_python-layer = "dunfell kirkstone scarthgap"

meta-protos/meta-python/recipes-core/python/python3-crudini/python3-crudini_0.9.4.bb

@@ -0,0 +1,23 @@
+SUMMARY = "An utility for manipulating ini files"
+DESCRIPTION = "CLI utility for ini file manipulation"
+AUTHOR = "pixelb"
+HOMEPAGE = "https://github.com/pixelb/crudini"
+BUGTRACKER = "https://github.com/pixelb/crudini/issues"
+SECTION = "development"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+CVE_PRODUCT = ""
+
+DEPENDS += "\
+    python3-pip-native \
+    python3-setuptools-scm-native \
+"
+
+SRC_URI[sha256sum] = "6fd0eb341b6cbd91e1883030ea9f2102c1c95619eb563af7ddabc2161e019f6b"
+
+inherit pypi setuptools3
+
+RDEPENDS:${PN} += "python3-iniparse"
+
+BBCLASSEXTEND = "native nativesdk"

meta-protos/meta-python/recipes-core/python/python3-uinput/backport.md

@@ -0,0 +1,5 @@
+# Backport
+
+Available with *meta-python > langdale (Yocto Project 4.1)*.
+
+Upstream revision: `3f2aee1b080e2f9ab2d0a7326581dad2f07ca6ef`

meta-protos/meta-python/recipes-core/python/python3-uinput/python3-uinput/0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch

@@ -0,0 +1,43 @@
+From 69adf9e32f5b11e15c0cbe17f9331c77fed65bf8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 28 May 2022 15:50:50 -0700
+Subject: [PATCH] Deal with 64bit time_t default on 32bit architectures
+
+Deal with Y2K38 concerns related to Linux input events on more recent
+kernels and libcs on 32-bit systems
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libsuinput/src/suinput.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/libsuinput/src/suinput.c b/libsuinput/src/suinput.c
+index 8d5fb71..13ff16a 100644
+--- a/libsuinput/src/suinput.c
++++ b/libsuinput/src/suinput.c
+@@ -45,11 +45,20 @@ int suinput_emit(int uinput_fd, uint16_t ev_type, uint16_t ev_code,
+         struct input_event event;
+
+         memset(&event, 0, sizeof(event));
+-        gettimeofday(&event.time, 0);
+         event.type = ev_type;
+         event.code = ev_code;
+         event.value = ev_value;
+
++/* attempt to deal with 64-bit time keeping on recent 32-bit systems */
++#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64))
++	gettimeofday(&event.time, 0);
++#else
++        struct timeval now;
++        memset(&now, 0, sizeof(now));
++        gettimeofday(&now, 0);
++        event.input_event_sec  = now.tv_sec;
++        event.input_event_usec = now.tv_usec;
++#endif
+         return suinput_write_event(uinput_fd, &event);
+ }
+
+-- 
+2.36.1
+

meta-protos/meta-python/recipes-core/python/python3-uinput/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch

@@ -0,0 +1,28 @@
+From 7a4dde83a9584adb42c7f810d882b1fbf5767e2c Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <brgl@bgdev.pl>
+Date: Tue, 24 May 2022 21:43:35 +0200
+Subject: [PATCH] setup: use setuptools instead of distutils
+
+The latter is deprecated, use setuptools instead.
+
+Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 3fa3343..4900b8b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -3,7 +3,7 @@
+ import errno
+ import subprocess
+
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+
+ libudev_so = "libudev.so.1"
+
+-- 
+2.34.1
+

meta-protos/meta-python/recipes-core/python/python3-uinput/python3-uinput_0.11.2.bb

@@ -0,0 +1,23 @@
+SUMMARY = "Python interface to Linux uinput kernel module."
+DESCRIPTION = "Python-uinput is Python interface to Linux uinput kernel module which allows attaching userspace device drivers into kernel. In practice, Python-uinput makes it dead simple to create virtual joysticks, keyboards and mice for generating arbitrary input events programmatically."
+HOMEPAGE = "https://pypi.org/project/python-uinput/"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+
+DEPENDS += "udev"
+
+SRC_URI:append = " \
+    file://0001-setup-use-setuptools-instead-of-distutils.patch \
+    file://0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch \
+"
+SRC_URI[sha256sum] = "99392b676c77b5795b86b7d75274db33fe754fd1e06fb3d58b167c797dc47f0c"
+
+PYPI_PACKAGE = "python-uinput"
+
+inherit pypi setuptools3
+
+RDEPENDS:${PN} += "\
+    python3-ctypes \
+    python3-distutils \
+"
+RRECOMMENDS:${PN} += "kernel-module-uinput"

meta-protos/meta-python/recipes-devtools/python3-exceptiongroup/python3-exceptiongroup.inc

@@ -0,0 +1,10 @@
+SUMMARY = "Backport of PEP 654 (exception groups)"
+DESCRIPTION = "This is a backport of the BaseExceptionGroup and ExceptionGroup classes from Python 3.11."
+AUTHOR = "Alex Grönholm <alex.gronholm@nextday.fi>"
+HOMEPAGE = "https://github.com/agronholm/exceptiongroup"
+BUGTRACKER = "https://github.com/agronholm/exceptiongroup/issues"
+SECTION = "development"
+LICENSE = "MIT"
+
+CVE_PRODUCT = ""
+

meta-protos/meta-python/recipes-devtools/python3-exceptiongroup/python3-exceptiongroup_1.2.0.bb

@@ -0,0 +1,12 @@
+require ${PN}.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d5caa317463c433575efff1d2fe206d7"
+
+SRC_URI[sha256sum] = "91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"
+
+inherit pypi python_flit_core
+
+PYPI_PACKAGE = "exceptiongroup"
+
+BBCLASSEXTEND = "native nativesdk"
+

meta-protos/meta-python/recipes-devtools/python3-js2py/python3-js2py.inc

@@ -0,0 +1,10 @@
+SUMMARY = "JavaScript to Python Translator and JavaScript interpreter."
+DESCRIPTION = "Translates JavaScript to Python code. Js2Py is able to translate and execute virtually any JavaScript code. Js2Py is written in pure python and does not have any dependencies. Basically an implementation of JavaScript core in pure python."
+AUTHOR = "Piotr Dabkowski <piodrus@gmail.com>"
+HOMEPAGE = "https://github.com/PiotrDabkowski/Js2Py"
+BUGTRACKER = "https://github.com/PiotrDabkowski/Js2Py/issues"
+SECTION = "development"
+LICENSE = "MIT"
+
+CVE_PRODUCT = ""
+

meta-protos/meta-python/recipes-devtools/python3-js2py/python3-js2py_0.74.bb

@@ -0,0 +1,18 @@
+require ${PN}.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=faa744092d3fb3314632e815e7c3a560"
+
+SRC_URI[sha256sum] = "39f3a6aa8469180efba3c8677271df27c31332fd1b471df1af2af58b87b8972f"
+
+inherit pypi setuptools3
+
+RDEPENDS:${PN} += "\
+    python3-pyjsparser \
+    python3-six \
+    python3-tzlocal \
+"
+
+PYPI_PACKAGE = "Js2Py"
+
+BBCLASSEXTEND = "native nativesdk"
+

meta-protos/meta-python/recipes-devtools/python3-paramiko/python3-paramiko.inc

@@ -0,0 +1,10 @@
+SUMMARY = "The leading native Python SSHv2 protocol library."
+DESCRIPTION = "Paramiko is a pure-Python implementation of the SSHv2 protocol, providing both client and server functionality."
+AUTHOR = "paramiko"
+HOMEPAGE = "https://www.paramiko.org/"
+BUGTRACKER = "https://github.com/paramiko/paramiko/issues"
+SECTION = "development"
+LICENSE = "LGPL-2.1-only"
+
+CVE_PRODUCT = ""
+

meta-protos/meta-python/recipes-devtools/python3-paramiko/python3-paramiko_3.1.0.bb

@@ -0,0 +1,17 @@
+require ${PN}.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5"
+
+SRC_URI[sha256sum] = "6950faca6819acd3219d4ae694a23c7a87ee38d084f70c1724b0c0dbb8b75769"
+
+PYPI_PACKAGE = "paramiko"
+
+inherit pypi setuptools3
+
+RDEPENDS:${PN} += "\
+    python3-bcrypt \
+    python3-cryptography \
+    python3-pynacl \
+"
+
+BBCLASSEXTEND = "native nativesdk"

meta-protos/meta-python/recipes-devtools/python3-plumbum/python3-plumbum.inc

@@ -0,0 +1,10 @@
+SUMMARY = "Plumbum: Shell Combinators"
+DESCRIPTION = "Plumbum is a small yet feature-rich library for shell script-like programs in Python."
+AUTHOR = "Tomer Filiba"
+HOMEPAGE = "https://plumbum.readthedocs.io"
+BUGTRACKER = "https://github.com/tomerfiliba/plumbum/issues"
+SECTION = "development"
+LICENSE = "MIT"
+
+CVE_PRODUCT = ""
+

meta-protos/meta-python/recipes-devtools/python3-plumbum/python3-plumbum_1.8.1.bb

@@ -0,0 +1,18 @@
+require ${PN}.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f638c141bfa8dc89f890a3a4ee2cb888"
+
+SRC_URI[sha256sum] = "88a40fc69247d0cd585e21ca169b3820f46c484535102e16455d2202727bb37b"
+
+PYPI_PACKAGE = "plumbum"
+
+inherit pypi setuptools3
+
+do_configure:prepend() {
+    cat > ${S}/setup.py <<-EOF
+from setuptools import setup
+setup()
+EOF
+}
+
+BBCLASSEXTEND = "native nativesdk"