Support odin-control 2.0.0

os/petalinux-custom/project-spec/meta-user/classes/odin-control-instance.bbclass

@@ -1,5 +1,5 @@
 # RDEPENDS specifies packages that are required at runtime on the host, as well as for build.
-RDEPENDS:${PN} += "odin-control (>=1.3.0)"
+RDEPENDS:${PN} += "python3-odin-control (>=2.0.0)"
 RDEPENDS:${PN} += "odin-sequencer (>=0.2.0)"
 RDEPENDS:${PN} += "odin-devices (>=1.1.0)"
 RDEPENDS:${PN} += "python3-msgpack"

os/petalinux-custom/project-spec/meta-user/classes/python3-odin-control.bbclass

@@ -0,0 +1,21 @@
+SUMMARY = "This is a recipe to build odin-control on PetaLinux from PyPI"
+
+# Based on the pypi bbclass from langdale: https://docs.yoctoproject.org/langdale/ref-manual/classes.html#pypi-bbclass
+# This ssets the URI, SECTION, HOMEPAGE, UPSTREAM_CHECK_URI, UPSTREAM_CHECK_REGEX  and CVE_PRODUCT. It will automatically
+# pull from the same package name as this file, with python-/python3- stripped if necessary.
+
+# Update the package name- this would normally come from the filename, but in our case  it needs an underscore,
+# which is not allowed.
+PYPI_PACKAGE = "odin_control"
+
+# This has to be in the format expected in Yocto's license list...
+LICENSE = "Apachev2"
+# Get this value by running md5sum on the license file
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+
+inherit pypi python_setuptools_build_meta
+
+DEPENDS += " \
+    python3-setuptools-scm-native \
+    python3-toml-native \
+"

os/petalinux-custom/project-spec/meta-user/conf/layer.conf

@@ -11,5 +11,10 @@ BBFILE_PRIORITY_meta-loki-bsp-legacy = "8"
 LAYERSERIES_COMPAT_meta-loki-bsp-legacy = "langdale"
 
 OE_TERMINAL = "screen"
-SIGGEN_UNLOCKED_RECIPES += " dropbear tzdata"
+
+# These recipes are locked to keep you from updating core components in the current Yocto version.
+# They have been upgraded only where absolutely necessary, and could be removed if the entire
+# Yocto version was advanced.
+SIGGEN_UNLOCKED_RECIPES += " dropbear tzdata python3-setuptools-scm-native"
+
 IMAGE_INSTALL:append = " libgpiod-tools nfs-utils git ntp ntpdate ntpq sntp tzdata parted u-boot-tools python-loki-adapter loki-user loki-config loki-update python3-zoneinfo"

os/petalinux-custom/project-spec/meta-user/recipes-apps/loki-update/loki-update-adapter.bb

@@ -2,7 +2,7 @@ SUMMARY = "A recipe for the Loki Update adapter"
 
 HOMEPAGE = "https://github.com/stfc-aeg/loki-update"
 
-RDEPENDS:${PN} += "odin-control (>= 1.6.0)"
+RDEPENDS:${PN} += "python3-odin-control (>=2.0.0)"
 RDEPENDS:${PN} += "python3-pyfdt"
 
 # Repo will be cloned into here
@@ -30,4 +30,4 @@ do_install:prepend() {
 
 LICENSE = "CLOSED"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git"

os/petalinux-custom/project-spec/meta-user/recipes-apps/odin-control/python3-odin-control_2.0.0.bb

@@ -0,0 +1,12 @@
+inherit python3-odin-control
+
+RDEPENDS:${PN} += "python3-tornado (>=6.0)"
+RDEPENDS:${PN} += "python3-psutil (>=5.0)"
+
+SRC_URI[sha256sum] = "52f74abe94aebcdd19018894dcc343950d65e022ff68f7be4604edd472632eb3"
+
+# Specific build tool versions for installation from the pyproject.toml
+DEPENDS += " \
+	python3-setuptools (>=64) \
+    python3-setuptools-scm-native (>=8) \
+"

os/petalinux-custom/project-spec/meta-user/recipes-apps/odin-devices/odin-devices_1.0.0.bb

@@ -2,7 +2,7 @@ SUMMARY = "This is a recipe to build odin-devices on PetaLinux"
 
 # RDEPENDS specifies packages that are required at runtime on the host, as well as for build.
 RDEPENDS:${PN} += "python3-setuptools"
-RDEPENDS:${PN} += "odin-control"
+RDEPENDS:${PN} += "python3-odin-control (>=1.6.0)"
 RDEPENDS:${PN} += "python3-spidev"
 RDEPENDS:${PN} += "python3-smbus"
 

os/petalinux-custom/project-spec/meta-user/recipes-apps/odin-devices/odin-devices_1.1.0.bb

@@ -2,7 +2,7 @@ SUMMARY = "This is a recipe to build odin-devices on PetaLinux"
 
 # RDEPENDS specifies packages that are required at runtime on the host, as well as for build.
 RDEPENDS:${PN} += "python3-setuptools"
-RDEPENDS:${PN} += "odin-control"
+RDEPENDS:${PN} += "python3-odin-control (>=1.6.0)"
 RDEPENDS:${PN} += "python3-spidev"
 RDEPENDS:${PN} += "python3-smbus2"
 

os/petalinux-custom/project-spec/meta-user/recipes-apps/odin-loki-adapter/python-loki-adapter.bb

@@ -3,7 +3,7 @@ SECTION = "examples"
 LICENSE = "CLOSED"
 
 RDEPENDS:${PN} += "python3-setuptools"
-RDEPENDS:${PN} += "odin-control (>=1.3.0)"
+RDEPENDS:${PN} += "python3-odin-control (>=2.0.0)"
 RDEPENDS:${PN} += "odin-devices (>=1.1.0)"
 
 SRC_URI = "file://setup.py \

os/petalinux-custom/project-spec/meta-user/recipes-apps/odin-sequencer/odin-sequencer_0.2.0.bb

@@ -1,7 +1,7 @@
 SUMMARY = "This is a recipe to build odin-sequencer on PetaLinux"
 
 # RDEPENDS specifies packages that are required at runtime on the host, as well as for build.
-RDEPENDS:${PN} += "odin-control"
+RDEPENDS:${PN} += "python3-odin-control (>=1.6.0)"
 RDEPENDS:${PN} += "python3-inotify"
 
 # To build to a tag, update the tag here as well as the commit hash below.

os/petalinux-custom/project-spec/meta-user/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch

@@ -0,0 +1,35 @@
+From a1cc419a118560d63e1ab8838c256a3622185750 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Thu, 13 Feb 2025 15:44:40 +0100
+Subject: [PATCH] respect GIT_CEILING_DIRECTORIES
+
+Fix for https://github.com/pypa/setuptools-scm/issues/1103
+
+When searching for the root-directory of the git repository e.g. with git rev-parse --show-toplevel,
+git stops the search when reaching $GIT_CEILING_DIRECTORIES. By ignoring this variable, the function
+_git_toplevel can go above the real git repository (e.g. when packaging a tarball without .git repository),
+and then runs "git archive" on an unrelated git repository.
+
+Upstream-Status: Pending
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ src/setuptools_scm/_run_cmd.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/setuptools_scm/_run_cmd.py b/src/setuptools_scm/_run_cmd.py
+index f2a8285..7e13d9f 100644
+--- a/src/setuptools_scm/_run_cmd.py
++++ b/src/setuptools_scm/_run_cmd.py
+@@ -98,7 +98,7 @@ def no_git_env(env: Mapping[str, str]) -> dict[str, str]:
+         k: v
+         for k, v in env.items()
+         if not k.startswith("GIT_")
+-        or k in ("GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")
++        or k in ("GIT_CEILING_DIRECTORIES", "GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")
+     }
+
+
+-- 
+2.43.0

os/petalinux-custom/project-spec/meta-user/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb

@@ -0,0 +1,32 @@
+SUMMARY = "the blessed package to manage your versions by scm tags"
+HOMEPAGE = "https://pypi.org/project/setuptools-scm/"
+DESCRIPTION = "setuptools_scm handles managing your Python package \
+versions in SCM metadata instead of declaring them as the version \
+argument or in a SCM managed file."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2"
+
+SRC_URI += "file://0001-respect-GIT_CEILING_DIRECTORIES.patch"
+SRC_URI[sha256sum] = "b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7"
+
+inherit pypi python_setuptools_build_meta
+
+UPSTREAM_CHECK_REGEX = "scm-(?P<pver>.*)\.tar"
+
+DEPENDS += "python3-tomli-native python3-packaging-native python3-typing-extensions-native"
+
+RDEPENDS:${PN} = "\
+    python3-packaging \
+    python3-pip \
+    python3-pyparsing \
+    python3-setuptools \
+    python3-tomli \
+    python3-typing-extensions \
+"
+
+RDEPENDS:${PN}:append:class-target = " \
+    python3-debugger \
+    python3-json \
+"
+
+BBCLASSEXTEND = "native nativesdk"