From 4a1ea32bb66f72f8d245399a576c69d12f6a7676 Mon Sep 17 00:00:00 2001
From: Aaron Brice <aaron@embeddedts.com>
Date: Mon, 13 Jul 2026 23:26:34 +0000
Subject: [PATCH 1/6] Initial update for wrynose LTS release

- 5.1: replace WORKDIR with UNPACKDIR
- 5.3: remove 'S = ${WORKDIR}/git', not needed anymore
- 5.3: Make sure spaces are around 'VAR = VALUE', bitbake will warn

Signed-off-by: Aaron Brice <aaron@embeddedts.com>
---
 conf/layer.conf                               |  2 +-
 .../idleinject-start/idleinject-start.bb      |  7 ++++--
 recipes-bsp/idleinject/idleinject_1.1.0.bb    |  2 --
 .../ts4900-fpga/ts4900-fpga_20170510.bb       |  4 ++--
 .../u-boot-distroboot-scripts_1.0.bb          |  7 ++++--
 .../wpa-supplicant/wpa-supplicant_2.9.bb      | 12 +++++-----
 .../udev-touchscreen-rules_1.0.bb             |  2 +-
 .../zpu/zpu-elf-gcc-armhf_3.4.2.bb            | 18 +--------------
 .../zpu/zpu-elf-gcc-native_3.4.2.bb           | 22 +------------------
 .../ts4100-utils/ts4100-utils_2.0.0.bb        |  4 +---
 .../ts4900-utils/ts4900-utils_2.0.2.bb        |  2 --
 .../ts7100-utils/ts7100-utils_1.0.3.bb        |  2 --
 .../ts7180-utils/ts7180-utils_1.0.0.bb        |  2 --
 .../ts7553v2-utils/ts7553v2-utils_2.0.1.bb    |  2 --
 .../tssilomon-start/tssilomon-start.bb        |  7 ++++--
 .../firmware/wilc3000-firmware_16.3.bb        |  2 --
 .../wilc3000-external-module_git.bb           |  8 +++----
 17 files changed, 31 insertions(+), 74 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index fcfdfc3..876615d 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-LAYERSERIES_COMPAT_ts = "scarthgap"
+LAYERSERIES_COMPAT_ts = "wrynose"
 
 BBFILE_COLLECTIONS += "ts"
 BBFILE_PATTERN_ts := "^${LAYERDIR}/"
diff --git a/recipes-bsp/idleinject-start/idleinject-start.bb b/recipes-bsp/idleinject-start/idleinject-start.bb
index 8fffc8f..5b423a5 100644
--- a/recipes-bsp/idleinject-start/idleinject-start.bb
+++ b/recipes-bsp/idleinject-start/idleinject-start.bb
@@ -7,16 +7,19 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31
 SRC_URI = "file://idleinject.service \
 	   file://idleinject"
 
+# To stop yocto from warning that $S directory does not exist
+S = "${UNPACKDIR}"
+
 inherit systemd update-rc.d
 
 do_install() {
     if "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/idleinject.service ${D}${systemd_unitdir}/system
+        install -m 0644 ${UNPACKDIR}/idleinject.service ${D}${systemd_unitdir}/system
         sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/idleinject.service
     elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        install -m 0744 ${WORKDIR}/idleinject ${D}${sysconfdir}/init.d/idleinject
+        install -m 0744 ${UNPACKDIR}/idleinject ${D}${sysconfdir}/init.d/idleinject
         sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${sysconfdir}/init.d/idleinject
     else
 	bbfatal "Using neither systemd nor sysvinit for init system! idleinject startup script will not be installed but is required for safe operation! Consider using systemd or sysvinit for the init system."
diff --git a/recipes-bsp/idleinject/idleinject_1.1.0.bb b/recipes-bsp/idleinject/idleinject_1.1.0.bb
index ca1506b..af65aec 100644
--- a/recipes-bsp/idleinject/idleinject_1.1.0.bb
+++ b/recipes-bsp/idleinject/idleinject_1.1.0.bb
@@ -11,6 +11,4 @@ BRANCH = "main"
 SRC_URI = "git://github.com/embeddedTS/idleinject.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-S = "${WORKDIR}/git"
-
 inherit meson pkgconfig
diff --git a/recipes-bsp/ts4900-fpga/ts4900-fpga_20170510.bb b/recipes-bsp/ts4900-fpga/ts4900-fpga_20170510.bb
index 619a22b..58b7aa0 100644
--- a/recipes-bsp/ts4900-fpga/ts4900-fpga_20170510.bb
+++ b/recipes-bsp/ts4900-fpga/ts4900-fpga_20170510.bb
@@ -10,11 +10,11 @@ SRC_URI = "https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux
            file://LICENSE.txt;md5=e0398ea6391ea94e81667cdb86a0aaf3"
 SRC_URI[sha256sum] = "f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}/boot/
-    install -m 0755 "${WORKDIR}/ts4900-fpga-${PV}.bin" ${D}/boot/ts4900-fpga.bin
+    install -m 0755 "${UNPACKDIR}/ts4900-fpga-${PV}.bin" ${D}/boot/ts4900-fpga.bin
 }
 
 FILES:${PN} += "/boot/*"
diff --git a/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb b/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb
index f5bafcc..2deff24 100644
--- a/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb
+++ b/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb
@@ -14,13 +14,16 @@ SRC_URI = "\
     file://boot-ts7840.source \
 "
 
+# To stop yocto from warning that $S directory does not exist
+S = "${UNPACKDIR}"
+
 # Note that, if using custom U-Boot scripts on _any_ platform, it should possible
 # to extend this with a .bbappend file to add additional files to be considered
 # so long as they are named "boot-<machine>.source" and the machine is expecting
 # a script name /boot/boot.scr
 do_compile () {
-	if [ -f "${WORKDIR}/boot-${MACHINE}.source" ]; then
-		cp "${WORKDIR}/boot-${MACHINE}.source" "${S}/boot.source"
+	if [ -f "${UNPACKDIR}/boot-${MACHINE}.source" ]; then
+		cp "${UNPACKDIR}/boot-${MACHINE}.source" "${S}/boot.source"
 		uboot-mkimage -A arm -T script -C none -n 'boot' \
 			-d "${S}/boot.source" "${S}/boot.scr"
 	else
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
index f73ee91..e1013a0 100644
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
@@ -39,7 +39,7 @@ SRC_URI[sha256sum] = "fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3
 
 CVE_PRODUCT = "wpa_supplicant"
 
-S = "${WORKDIR}/wpa_supplicant-${PV}"
+S = "${UNPACKDIR}/wpa_supplicant-${PV}"
 
 PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
 FILES:wpa-supplicant-passphrase = "${base_bindir}/wpa_passphrase"
@@ -49,7 +49,7 @@ CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
 	${MAKE} -C wpa_supplicant clean
-	install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config
+	install -m 0755 ${UNPACKDIR}/defconfig wpa_supplicant/.config
 
 	if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then
         	ssl=openssl
@@ -82,15 +82,15 @@ do_install () {
 	install -m 755 wpa_supplicant/wpa_passphrase ${D}${base_bindir}
 
 	install -d ${D}${docdir}/wpa_supplicant
-	install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
+	install -m 644 wpa_supplicant/README ${UNPACKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
 
 	install -d ${D}${sysconfdir}
-	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
+	install -m 600 ${UNPACKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
 
 	install -d ${D}${sysconfdir}/network/if-pre-up.d/
 	install -d ${D}${sysconfdir}/network/if-post-down.d/
 	install -d ${D}${sysconfdir}/network/if-down.d/
-	install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
+	install -m 755 ${UNPACKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
 	cd ${D}${sysconfdir}/network/ && \
 	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
 
@@ -105,7 +105,7 @@ do_install () {
 	fi
 
 	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
+	install -m 0644 ${UNPACKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
 
 pkg_postinst:${PN} () {
diff --git a/recipes-core/udev-touchscreen-rules/udev-touchscreen-rules_1.0.bb b/recipes-core/udev-touchscreen-rules/udev-touchscreen-rules_1.0.bb
index 4911f7b..a1b455e 100644
--- a/recipes-core/udev-touchscreen-rules/udev-touchscreen-rules_1.0.bb
+++ b/recipes-core/udev-touchscreen-rules/udev-touchscreen-rules_1.0.bb
@@ -14,7 +14,7 @@ SRC_URI:append:ts7990 = " file://99-ts7990-resistive-touchscreen.rules"
 do_install () {
 	install -d "${D}${sysconfdir}/udev/rules.d/"
 
-	for I in ${WORKDIR}/*${MACHINE}*; do
+	for I in ${UNPACKDIR}/*${MACHINE}*; do
 		if [ -f "${I}" ]; then
 			install -m 0644 "${I}" \
 				"${D}${sysconfdir}/udev/rules.d/"
diff --git a/recipes-devtools/zpu/zpu-elf-gcc-armhf_3.4.2.bb b/recipes-devtools/zpu/zpu-elf-gcc-armhf_3.4.2.bb
index 45ba2c7..fb0839e 100644
--- a/recipes-devtools/zpu/zpu-elf-gcc-armhf_3.4.2.bb
+++ b/recipes-devtools/zpu/zpu-elf-gcc-armhf_3.4.2.bb
@@ -5,25 +5,9 @@ HOMEPAGE = "https://github.com/zylin/zpugcc"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4100-linux/zpu/armhf-zpu-elf-gcc-${PV}.tar.bz2"
+SRC_URI = "https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4100-linux/zpu/armhf-zpu-elf-gcc-${PV}.tar.bz2;subdir=${BP}"
 SRC_URI[sha256sum] = "a0a2c143260a31796637ac3643b0cd661716447c4a20319d570d66b56fe5eb53"
 
-do_unpack() {
-	# For _some_ reason, the default do_unpack extracts the tarball to
-	# ${WORKDIR}/ instead of ${S}/ (which would default to
-	# ${WORKDIR}/${PN}-${PV}). So we need to write our own custom unpack task
-	# just to do the thing that should already be done.
-	# Much of the complexty of this comes from the fact that Yocto _really_
-	# likes to have names match when that doesn't make sense in the case of
-	# this. e.g. their naming also wants to enforce -native in the .bb name
-	# to note that it is for the host. The naming of the tarball and the first
-	# folder of it prepends the arch rather than appending it. So, if we strip
-	# the root folder of the tarball when we unpack it to ${S}, we should
-	# finally be able to just copy the contents of ${S} to have the structure
-	# we need.
-	tar xhf "${DL_DIR}/$(basename "${SRC_URI}")" --strip-components=1 -C "${S}"
-}
-
 do_install() {
 	install -d "${D}/opt/zpu-elf-gcc/"
 	cp -r "${S}"/* "${D}/opt/zpu-elf-gcc/"
diff --git a/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb b/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb
index dd9867f..ce59777 100644
--- a/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb
+++ b/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb
@@ -7,29 +7,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
 
 inherit native
 
-SRC_URI = "https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4100-linux/zpu/x86_64-zpu-elf-gcc-${PV}.tar.bz2"
+SRC_URI = "https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4100-linux/zpu/x86_64-zpu-elf-gcc-${PV}.tar.bz2;subdir=${BP}"
 SRC_URI[sha256sum] = "cf85d22d469bbbd89c02f22707e923aa1febc21180ad0467cd24602d9e3e3613"
 
-do_unpack() {
-	if [ "${BUILD_ARCH}" = "x86_64" ] ; then
-		# For _some_ reason, the default do_unpack extracts the tarball
-		# to ${WORKDIR}/ instead of ${S}/ (which would default to
-		# ${WORKDIR}/${PN}-${PV}). So we need to write our own custom
-		# unpack task just to do the thing that should already be done.
-		# Much of the complexty of this comes from the fact that Yocto
-		# _really_ likes to have names match when that doesn't make sense
-		# in the case of this. e.g. their naming also wants to enforce
-		# -native in the .bb name to note that it is for the host. The
-		# naming of the tarball and the first folder of it prepends the
-		# arch rather than appending it. So, if we strip the root folder
-		# of the tarball when we unpack it to ${S}, we should finally be
-		# able to just copy the contents of ${S} to have the structure
-		# we need.
-		tar xhf "${DL_DIR}/$(basename "${SRC_URI}")" --strip-components=1 \
-			-C "${S}"
-	fi
-}
-
 do_install() {
 	if [ "${BUILD_ARCH}" = "x86_64" ] ; then
 		install -d "${D}/${base_bindir}/zpu-elf-gcc/"
diff --git a/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb b/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb
index 141eda6..048ab8b 100644
--- a/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb
+++ b/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb
@@ -8,15 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0deb455fa485cd99c8fd0344ea4b23b4"
 DEPENDS = " libgpiod zpu-elf-gcc-native"
 # If this machine has tssilo support enabled, then we need the startup script.
 # Since the tssilomon script uses libgpiod-tools, that also is needed at runtime
-RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'tssilo', 'tssilomon-start libgpiod-tools', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'tssilo', 'tssilomon-start libgpiod-tools', '', d)} bash"
 
 BRANCH = "master"
 
 SRC_URI = "git://github.com/embeddedTS/ts4100-utils.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-S = "${WORKDIR}/git"
-
 # The zpu-elf-gcc-native recipe installs the toolchain to ${base_bindir}/zpu-elf-gcc/
 # and the actual executable is within bin/ of that folder.
 # Note that, there does not appear to be a way for a recipe to add arbitrary
diff --git a/recipes-extended/ts4900-utils/ts4900-utils_2.0.2.bb b/recipes-extended/ts4900-utils/ts4900-utils_2.0.2.bb
index 7e04d20..136a183 100644
--- a/recipes-extended/ts4900-utils/ts4900-utils_2.0.2.bb
+++ b/recipes-extended/ts4900-utils/ts4900-utils_2.0.2.bb
@@ -16,6 +16,4 @@ BRANCH = "master"
 SRC_URI = "git://github.com/embeddedTS/ts4900-utils.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
diff --git a/recipes-extended/ts7100-utils/ts7100-utils_1.0.3.bb b/recipes-extended/ts7100-utils/ts7100-utils_1.0.3.bb
index 7779b21..1defdca 100644
--- a/recipes-extended/ts7100-utils/ts7100-utils_1.0.3.bb
+++ b/recipes-extended/ts7100-utils/ts7100-utils_1.0.3.bb
@@ -15,6 +15,4 @@ BRANCH = "master"
 SRC_URI = "git://github.com/embeddedTS/ts7100-utils.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
diff --git a/recipes-extended/ts7180-utils/ts7180-utils_1.0.0.bb b/recipes-extended/ts7180-utils/ts7180-utils_1.0.0.bb
index 1f263aa..1ffb27f 100644
--- a/recipes-extended/ts7180-utils/ts7180-utils_1.0.0.bb
+++ b/recipes-extended/ts7180-utils/ts7180-utils_1.0.0.bb
@@ -16,6 +16,4 @@ BRANCH = "master"
 SRC_URI = "git://github.com/embeddedTS/ts7180-utils.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
diff --git a/recipes-extended/ts7553v2-utils/ts7553v2-utils_2.0.1.bb b/recipes-extended/ts7553v2-utils/ts7553v2-utils_2.0.1.bb
index 031160c..b7f7b16 100644
--- a/recipes-extended/ts7553v2-utils/ts7553v2-utils_2.0.1.bb
+++ b/recipes-extended/ts7553v2-utils/ts7553v2-utils_2.0.1.bb
@@ -17,6 +17,4 @@ BRANCH = "master"
 SRC_URI = "git://github.com/embeddedTS/ts7553v2-utils.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
diff --git a/recipes-extended/tssilomon-start/tssilomon-start.bb b/recipes-extended/tssilomon-start/tssilomon-start.bb
index 184c62e..70aa799 100644
--- a/recipes-extended/tssilomon-start/tssilomon-start.bb
+++ b/recipes-extended/tssilomon-start/tssilomon-start.bb
@@ -9,14 +9,17 @@ SRC_URI = "file://tssilomon.service \
 
 inherit systemd update-rc.d
 
+# To stop yocto from warning that $S directory does not exist
+S = "${UNPACKDIR}"
+
 do_install() {
     if "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/tssilomon.service ${D}${systemd_unitdir}/system
+        install -m 0644 ${UNPACKDIR}/tssilomon.service ${D}${systemd_unitdir}/system
         sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/tssilomon.service
     elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        install -m 0744 ${WORKDIR}/tssilomon ${D}${sysconfdir}/init.d/tssilomon
+        install -m 0744 ${UNPACKDIR}/tssilomon ${D}${sysconfdir}/init.d/tssilomon
         sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${sysconfdir}/init.d/tssilomon
     else
 	bbwarn "Using neither systemd nor sysvinit for init system! tssilomon startup script will not be installed!"
diff --git a/recipes-kernel/firmware/wilc3000-firmware_16.3.bb b/recipes-kernel/firmware/wilc3000-firmware_16.3.bb
index 72e9054..32d78d7 100644
--- a/recipes-kernel/firmware/wilc3000-firmware_16.3.bb
+++ b/recipes-kernel/firmware/wilc3000-firmware_16.3.bb
@@ -10,8 +10,6 @@ PV = "${TAG}"
 SRC_URI = "git://github.com/linux4wilc/firmware.git;protocol=https;branch=master"
 SRCREV = "${TAG}"
 
-S = "${WORKDIR}/git"
-
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/mchp/
     install -m 0644 ${S}/wilc3000_wifi_firmware.bin ${D}${nonarch_base_libdir}/firmware/mchp/
diff --git a/recipes-kernel/wilc3000-external-module/wilc3000-external-module_git.bb b/recipes-kernel/wilc3000-external-module/wilc3000-external-module_git.bb
index 40bd59f..5879cd5 100644
--- a/recipes-kernel/wilc3000-external-module/wilc3000-external-module_git.bb
+++ b/recipes-kernel/wilc3000-external-module/wilc3000-external-module_git.bb
@@ -1,16 +1,14 @@
-DESCRIPTION="External module for WILC3000 WiFi/BLE"
-HOMEPAGE="https://github.com/embeddedTS/wilc3000-external-module/"
+DESCRIPTION = "External module for WILC3000 WiFi/BLE"
+HOMEPAGE = "https://github.com/embeddedTS/wilc3000-external-module/"
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM="file://LICENSE;md5=e6a75371ba4d16749254a51215d13f97"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a75371ba4d16749254a51215d13f97"
 
 BRANCH = "2024.04-with-community-patches"
 
 SRC_URI = "git://github.com/embeddedTS/wilc3000-external-module.git;protocol=https;branch=${BRANCH}"
 SRCREV = "1e056e47144b8896a6a79204d128b529a5bd0b0f"
 
-S = "${WORKDIR}/git"
-
 inherit module
 
 # Set the build dir to the kernel source dir. Normally, the module class in

From e2cd51cbd29fbd2266064df1dac17cbe387da468 Mon Sep 17 00:00:00 2001
From: Aaron Brice <aaron@embeddedts.com>
Date: Fri, 7 Aug 2026 23:57:47 +0000
Subject: [PATCH 2/6] ts7180: Add u-boot-distroboot-scripts

Signed-off-by: Aaron Brice <aaron@embeddedts.com>
---
 conf/machine/ts7180.conf                                       | 2 ++
 recipes-bsp/u-boot-distroboot-scripts/files/boot-ts7180.source | 1 +
 .../u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 120000 recipes-bsp/u-boot-distroboot-scripts/files/boot-ts7180.source

diff --git a/conf/machine/ts7180.conf b/conf/machine/ts7180.conf
index d61e36a..e5d379d 100644
--- a/conf/machine/ts7180.conf
+++ b/conf/machine/ts7180.conf
@@ -2,5 +2,7 @@ include conf/machine/include/tsimx6ul.inc
 
 KERNEL_DEVICETREE = "nxp/imx/imx6ul-ts7180.dtb"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-distroboot-scripts"
+
 # XXX: Add "tssilo" to MACHINE_FEATURES once ts7180-utils gets tssilomon
 # script fully set up
diff --git a/recipes-bsp/u-boot-distroboot-scripts/files/boot-ts7180.source b/recipes-bsp/u-boot-distroboot-scripts/files/boot-ts7180.source
new file mode 120000
index 0000000..1f018a3
--- /dev/null
+++ b/recipes-bsp/u-boot-distroboot-scripts/files/boot-ts7180.source
@@ -0,0 +1 @@
+boot-ts7100.source
\ No newline at end of file
diff --git a/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb b/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb
index 2deff24..44fbf6e 100644
--- a/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb
+++ b/recipes-bsp/u-boot-distroboot-scripts/u-boot-distroboot-scripts_1.0.bb
@@ -1,7 +1,7 @@
 SUMMARY = "U-Boot scripts for distroboot compatible embeddedTS platforms"
 HOMEPAGE = "http://www.embeddedTS.com/"
 
-COMPATIBLE_MACHINE = "(ts7100|ts7250v3|ts7840)"
+COMPATIBLE_MACHINE = "(ts7100|ts7180|ts7250v3|ts7840)"
 
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f"
@@ -10,6 +10,7 @@ DEPENDS += "u-boot-mkimage-native"
 
 SRC_URI = "\
     file://boot-ts7100.source \
+    file://boot-ts7180.source \
     file://boot-ts7250v3.source \
     file://boot-ts7840.source \
 "

From a676957963b6c0c35f6716183d172ff63d5678bd Mon Sep 17 00:00:00 2001
From: Aaron Brice <aaron@embeddedts.com>
Date: Tue, 11 Aug 2026 21:04:37 +0000
Subject: [PATCH 3/6] Revert "recipes: use base_(s)bindir instead of (s)bindir"

This reverts commit e93b7831d8b53d876819064631d2a8b2581e3d94.

Signed-off-by: Aaron Brice <aaron@embeddedts.com>
---
 recipes-bsp/idleinject-start/idleinject-start.bb |  4 ++--
 .../wpa-supplicant/wpa-supplicant_2.9.bb         | 16 ++++++++--------
 recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb |  6 +++---
 .../ts4100-utils/ts4100-utils_2.0.0.bb           | 10 +++++-----
 .../tssilomon-start/tssilomon-start.bb           |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/recipes-bsp/idleinject-start/idleinject-start.bb b/recipes-bsp/idleinject-start/idleinject-start.bb
index 5b423a5..103d9ac 100644
--- a/recipes-bsp/idleinject-start/idleinject-start.bb
+++ b/recipes-bsp/idleinject-start/idleinject-start.bb
@@ -16,11 +16,11 @@ do_install() {
     if "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"; then
         install -d ${D}${systemd_unitdir}/system
         install -m 0644 ${UNPACKDIR}/idleinject.service ${D}${systemd_unitdir}/system
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/idleinject.service
+        sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${systemd_unitdir}/system/idleinject.service
     elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         install -m 0744 ${UNPACKDIR}/idleinject ${D}${sysconfdir}/init.d/idleinject
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${sysconfdir}/init.d/idleinject
+        sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/init.d/idleinject
     else
 	bbfatal "Using neither systemd nor sysvinit for init system! idleinject startup script will not be installed but is required for safe operation! Consider using systemd or sysvinit for the init system."
     fi
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
index e1013a0..bfa8fa5 100644
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
@@ -42,8 +42,8 @@ CVE_PRODUCT = "wpa_supplicant"
 S = "${UNPACKDIR}/wpa_supplicant-${PV}"
 
 PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
-FILES:wpa-supplicant-passphrase = "${base_bindir}/wpa_passphrase"
-FILES:wpa-supplicant-cli = "${base_sbindir}/wpa_cli"
+FILES:wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
+FILES:wpa-supplicant-cli = "${sbindir}/wpa_cli"
 FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*"
 CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
@@ -65,7 +65,7 @@ do_configure () {
 }
 
 export EXTRA_CFLAGS = "${CFLAGS}"
-export BINDIR = "${base_sbindir}"
+export BINDIR = "${sbindir}"
 
 do_compile () {
 	unset CFLAGS CPPFLAGS CXXFLAGS
@@ -74,12 +74,12 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}${base_sbindir}
-	install -m 755 wpa_supplicant/wpa_supplicant ${D}${base_sbindir}
-	install -m 755 wpa_supplicant/wpa_cli        ${D}${base_sbindir}
+	install -d ${D}${sbindir}
+	install -m 755 wpa_supplicant/wpa_supplicant ${D}${sbindir}
+	install -m 755 wpa_supplicant/wpa_cli        ${D}${sbindir}
 
-	install -d ${D}${base_bindir}
-	install -m 755 wpa_supplicant/wpa_passphrase ${D}${base_bindir}
+	install -d ${D}${bindir}
+	install -m 755 wpa_supplicant/wpa_passphrase ${D}${bindir}
 
 	install -d ${D}${docdir}/wpa_supplicant
 	install -m 644 wpa_supplicant/README ${UNPACKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
diff --git a/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb b/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb
index ce59777..48fffc4 100644
--- a/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb
+++ b/recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb
@@ -12,14 +12,14 @@ SRC_URI[sha256sum] = "cf85d22d469bbbd89c02f22707e923aa1febc21180ad0467cd24602d9e
 
 do_install() {
 	if [ "${BUILD_ARCH}" = "x86_64" ] ; then
-		install -d "${D}/${base_bindir}/zpu-elf-gcc/"
-		cp -r "${S}"/* "${D}/${base_bindir}/zpu-elf-gcc/"
+		install -d "${D}/${bindir}/zpu-elf-gcc/"
+		cp -r "${S}"/* "${D}/${bindir}/zpu-elf-gcc/"
 	else
 		bbwarn "Native ZPU toolchain only supports x86_64 build environments. Detected build architecture: ${BUILD_ARCH}. ZPU toolchain will not be available for other recipes!"
 	fi
 }
 
-FILES:${PN} += "/${base_bindir}/zpu-elf-gcc"
+FILES:${PN} += "/${bindir}/zpu-elf-gcc"
 
 # Since the toolchain includes ZPU ELF objects, we need to prevent the build
 # system from attempting to strip/split debug symbols on these objects
diff --git a/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb b/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb
index 048ab8b..5d89ebb 100644
--- a/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb
+++ b/recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb
@@ -15,7 +15,7 @@ BRANCH = "master"
 SRC_URI = "git://github.com/embeddedTS/ts4100-utils.git;protocol=https;branch=${BRANCH}"
 SRCREV = "v${PV}"
 
-# The zpu-elf-gcc-native recipe installs the toolchain to ${base_bindir}/zpu-elf-gcc/
+# The zpu-elf-gcc-native recipe installs the toolchain to ${bindir}/zpu-elf-gcc/
 # and the actual executable is within bin/ of that folder.
 # Note that, there does not appear to be a way for a recipe to add arbitrary
 # directories to $PATH that future recipes would use. So, any recipe using the
@@ -34,12 +34,12 @@ do_compile:append() {
 
 do_install:append() {
 	if [ -x "$(command -v zpu-elf-gcc)" ]; then
-		install -d "${D}${base_bindir}/zpu"
-		install -m 0644 "${S}/src/zpu/zpu_muxbus.bin" "${D}${base_bindir}/zpu"
-		install -m 0644 "${S}/src/zpu/zpu_demo.bin" "${D}${base_bindir}/zpu"
+		install -d "${D}${bindir}/zpu"
+		install -m 0644 "${S}/src/zpu/zpu_muxbus.bin" "${D}${bindir}/zpu"
+		install -m 0644 "${S}/src/zpu/zpu_demo.bin" "${D}${bindir}/zpu"
 	fi
 }
 
 inherit autotools pkgconfig
 
-FILES:${PN} += "${base_bindir}/zpu"
+FILES:${PN} += "${bindir}/zpu"
diff --git a/recipes-extended/tssilomon-start/tssilomon-start.bb b/recipes-extended/tssilomon-start/tssilomon-start.bb
index 70aa799..7de906e 100644
--- a/recipes-extended/tssilomon-start/tssilomon-start.bb
+++ b/recipes-extended/tssilomon-start/tssilomon-start.bb
@@ -16,11 +16,11 @@ do_install() {
     if "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"; then
         install -d ${D}${systemd_unitdir}/system
         install -m 0644 ${UNPACKDIR}/tssilomon.service ${D}${systemd_unitdir}/system
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/tssilomon.service
+        sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${systemd_unitdir}/system/tssilomon.service
     elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         install -m 0744 ${UNPACKDIR}/tssilomon ${D}${sysconfdir}/init.d/tssilomon
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${sysconfdir}/init.d/tssilomon
+        sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/init.d/tssilomon
     else
 	bbwarn "Using neither systemd nor sysvinit for init system! tssilomon startup script will not be installed!"
     fi

From bea0bc0f64102bdb4684870b92c2ed40a36a6899 Mon Sep 17 00:00:00 2001
From: Aaron Brice <aaron@embeddedts.com>
Date: Tue, 11 Aug 2026 21:05:44 +0000
Subject: [PATCH 4/6] idleinject: fix systemd service file

Signed-off-by: Aaron Brice <aaron@embeddedts.com>
---
 recipes-bsp/idleinject-start/files/idleinject.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/idleinject-start/files/idleinject.service b/recipes-bsp/idleinject-start/files/idleinject.service
index 6ab2b95..de0b7e3 100644
--- a/recipes-bsp/idleinject-start/files/idleinject.service
+++ b/recipes-bsp/idleinject-start/files/idleinject.service
@@ -3,7 +3,7 @@ Description=Monitor CPU temperatures and inject idle cycles if nearing max tempe
 
 [Service]
 Type=simple
-ExecStart=@BINDIR@/tssilomon
+ExecStart=@BINDIR@/idleinject
 
 [Install]
 WantedBy=multi-user.target

From 4d1bd2ebd986faae41e42ed8a5fcc55dd829c191 Mon Sep 17 00:00:00 2001
From: Aaron Brice <aaron@embeddedts.com>
Date: Wed, 19 Aug 2026 20:41:51 +0000
Subject: [PATCH 5/6] recipes-test: Adding cukinia tests

Signed-off-by: Aaron Brice <aaron@embeddedts.com>
---
 .../idleinject-start/idleinject-start.bb      |  2 +-
 .../tssilomon-start/tssilomon-start.bb        |  2 +-
 recipes-test/cukinia/cukinia-ets-tests.bb     | 45 +++++++++++++++++++
 recipes-test/cukinia/files/common.conf        |  6 +++
 recipes-test/cukinia/files/cukinia            | 42 +++++++++++++++++
 recipes-test/cukinia/files/cukinia.service    | 11 +++++
 .../cukinia/files/ts4100/cukinia.conf         |  3 ++
 .../cukinia/files/ts4900/cukinia.conf         |  1 +
 .../cukinia/files/ts7100/cukinia.conf         |  4 ++
 .../cukinia/files/ts7180/cukinia.conf         |  1 +
 .../cukinia/files/ts7250v3/cukinia.conf       |  1 +
 .../cukinia/files/ts7553v2/cukinia.conf       |  3 ++
 .../cukinia/files/ts7800v2/cukinia.conf       |  3 ++
 .../cukinia/files/ts7840/cukinia.conf         |  4 ++
 .../cukinia/files/ts7970/cukinia.conf         |  1 +
 .../cukinia/files/ts7990/cukinia.conf         |  3 ++
 recipes-test/cukinia/files/tssilomon.conf     |  1 +
 17 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 recipes-test/cukinia/cukinia-ets-tests.bb
 create mode 100644 recipes-test/cukinia/files/common.conf
 create mode 100644 recipes-test/cukinia/files/cukinia
 create mode 100644 recipes-test/cukinia/files/cukinia.service
 create mode 100644 recipes-test/cukinia/files/ts4100/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts4900/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7100/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7180/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7250v3/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7553v2/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7800v2/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7840/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7970/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/ts7990/cukinia.conf
 create mode 100644 recipes-test/cukinia/files/tssilomon.conf

diff --git a/recipes-bsp/idleinject-start/idleinject-start.bb b/recipes-bsp/idleinject-start/idleinject-start.bb
index 103d9ac..1b1c170 100644
--- a/recipes-bsp/idleinject-start/idleinject-start.bb
+++ b/recipes-bsp/idleinject-start/idleinject-start.bb
@@ -30,7 +30,7 @@ FILES:${PN} += "/"
 
 # These should do nothing if sysvinit is not defined as a DISTRO_FEATURE
 INITSCRIPT_NAME = "idleinject"
-INITSCRIPT_PARAMS = "defaults 99"
+INITSCRIPT_PARAMS = "defaults 95"
 
 # This should do nothing if systemd is not defined as a DISTRO_FEATURE
 SYSTEMD_SERVICE:${PN} = "idleinject.service"
diff --git a/recipes-extended/tssilomon-start/tssilomon-start.bb b/recipes-extended/tssilomon-start/tssilomon-start.bb
index 7de906e..9af35f6 100644
--- a/recipes-extended/tssilomon-start/tssilomon-start.bb
+++ b/recipes-extended/tssilomon-start/tssilomon-start.bb
@@ -30,7 +30,7 @@ FILES:${PN} += "/"
 
 # These should do nothing if sysvinit is not defined as a DISTRO_FEATURE
 INITSCRIPT_NAME = "tssilomon"
-INITSCRIPT_PARAMS = "defaults 99"
+INITSCRIPT_PARAMS = "defaults 95"
 
 # This should do nothing if systemd is not defined as a DISTRO_FEATURE
 #SYSTEMD_PACKAGES = "${PN}"
diff --git a/recipes-test/cukinia/cukinia-ets-tests.bb b/recipes-test/cukinia/cukinia-ets-tests.bb
new file mode 100644
index 0000000..8b74b07
--- /dev/null
+++ b/recipes-test/cukinia/cukinia-ets-tests.bb
@@ -0,0 +1,45 @@
+SUMMARY = "cukinia tests and startup files for meta-ts image verification"
+HOMEPAGE = "http://www.embeddedTS.com/"
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f"
+
+SRC_URI = " \
+    file://common.conf \
+    file://cukinia.conf \
+    file://tssilomon.conf \
+    file://cukinia \
+    file://cukinia.service \
+"
+
+RDEPENDS:${PN} = "cukinia"
+
+inherit systemd update-rc.d
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}
+    install -d ${D}${sysconfdir}/cukinia.d
+
+    install -m 0644 ${UNPACKDIR}/common.conf ${D}${sysconfdir}/cukinia.d/
+    install -m 0644 ${UNPACKDIR}/tssilomon.conf ${D}${sysconfdir}/cukinia.d/
+    install -m 0644 ${UNPACKDIR}/cukinia.conf ${D}${sysconfdir}
+    if "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"; then
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${UNPACKDIR}/cukinia.service ${D}${systemd_unitdir}/system
+    elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0744 ${UNPACKDIR}/cukinia ${D}${sysconfdir}/init.d/cukinia
+    fi
+}
+
+FILES:${PN} += "${sysconfdir}"
+
+# These should do nothing if sysvinit is not defined as a DISTRO_FEATURE
+INITSCRIPT_NAME = "cukinia"
+INITSCRIPT_PARAMS = "defaults 99"
+
+# This should do nothing if systemd is not defined as a DISTRO_FEATURE
+SYSTEMD_SERVICE:${PN} = "cukinia.service"
diff --git a/recipes-test/cukinia/files/common.conf b/recipes-test/cukinia/files/common.conf
new file mode 100644
index 0000000..9538b7f
--- /dev/null
+++ b/recipes-test/cukinia/files/common.conf
@@ -0,0 +1,6 @@
+cukinia_netif_is_up eth0
+
+# If this is a core-image-weston build make sure weston is running
+if [ -f /usr/bin/weston ]; then
+	cukinia_process weston
+fi
diff --git a/recipes-test/cukinia/files/cukinia b/recipes-test/cukinia/files/cukinia
new file mode 100644
index 0000000..30a28b1
--- /dev/null
+++ b/recipes-test/cukinia/files/cukinia
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Starts cukinia system test
+#
+
+DAEMON="cukinia"
+
+umask 077
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	start-stop-daemon -S -m -p /var/run/cukinia.pid -b --exec /usr/sbin/cukinia -- -f junitxml -o /results.xml /etc/cukinia.conf
+	echo "OK"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -m -p /var/run/cukinia.pid -b --exec /usr/sbin/cukinia
+	echo "OK"
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart|reload)
+		restart
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		exit 1
+esac
+
+exit $?
diff --git a/recipes-test/cukinia/files/cukinia.service b/recipes-test/cukinia/files/cukinia.service
new file mode 100644
index 0000000..14c6792
--- /dev/null
+++ b/recipes-test/cukinia/files/cukinia.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Run cukinia system tests
+# systemd does not consider it an error if these services don't exist.
+After=tssilomon.service idleinject.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/cukinia -f junitxml -o /results.xml /etc/cukinia.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-test/cukinia/files/ts4100/cukinia.conf b/recipes-test/cukinia/files/ts4100/cukinia.conf
new file mode 100644
index 0000000..f114aa3
--- /dev/null
+++ b/recipes-test/cukinia/files/ts4100/cukinia.conf
@@ -0,0 +1,3 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
+
+cukinia_conf_include /etc/cukinia.d/tssilomon.conf
diff --git a/recipes-test/cukinia/files/ts4900/cukinia.conf b/recipes-test/cukinia/files/ts4900/cukinia.conf
new file mode 100644
index 0000000..25a2d08
--- /dev/null
+++ b/recipes-test/cukinia/files/ts4900/cukinia.conf
@@ -0,0 +1 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
diff --git a/recipes-test/cukinia/files/ts7100/cukinia.conf b/recipes-test/cukinia/files/ts7100/cukinia.conf
new file mode 100644
index 0000000..e612685
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7100/cukinia.conf
@@ -0,0 +1,4 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
+
+cukinia_conf_include /etc/cukinia.d/tssilomon.conf
+
diff --git a/recipes-test/cukinia/files/ts7180/cukinia.conf b/recipes-test/cukinia/files/ts7180/cukinia.conf
new file mode 100644
index 0000000..25a2d08
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7180/cukinia.conf
@@ -0,0 +1 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
diff --git a/recipes-test/cukinia/files/ts7250v3/cukinia.conf b/recipes-test/cukinia/files/ts7250v3/cukinia.conf
new file mode 100644
index 0000000..25a2d08
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7250v3/cukinia.conf
@@ -0,0 +1 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
diff --git a/recipes-test/cukinia/files/ts7553v2/cukinia.conf b/recipes-test/cukinia/files/ts7553v2/cukinia.conf
new file mode 100644
index 0000000..f114aa3
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7553v2/cukinia.conf
@@ -0,0 +1,3 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
+
+cukinia_conf_include /etc/cukinia.d/tssilomon.conf
diff --git a/recipes-test/cukinia/files/ts7800v2/cukinia.conf b/recipes-test/cukinia/files/ts7800v2/cukinia.conf
new file mode 100644
index 0000000..b1ae018
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7800v2/cukinia.conf
@@ -0,0 +1,3 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
+
+cukinia_process idleinject
diff --git a/recipes-test/cukinia/files/ts7840/cukinia.conf b/recipes-test/cukinia/files/ts7840/cukinia.conf
new file mode 100644
index 0000000..54325dc
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7840/cukinia.conf
@@ -0,0 +1,4 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
+
+cukinia_process idleinject
+cukinia_conf_include /etc/cukinia.d/tssilomon.conf
diff --git a/recipes-test/cukinia/files/ts7970/cukinia.conf b/recipes-test/cukinia/files/ts7970/cukinia.conf
new file mode 100644
index 0000000..25a2d08
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7970/cukinia.conf
@@ -0,0 +1 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
diff --git a/recipes-test/cukinia/files/ts7990/cukinia.conf b/recipes-test/cukinia/files/ts7990/cukinia.conf
new file mode 100644
index 0000000..f114aa3
--- /dev/null
+++ b/recipes-test/cukinia/files/ts7990/cukinia.conf
@@ -0,0 +1,3 @@
+cukinia_conf_include /etc/cukinia.d/common.conf
+
+cukinia_conf_include /etc/cukinia.d/tssilomon.conf
diff --git a/recipes-test/cukinia/files/tssilomon.conf b/recipes-test/cukinia/files/tssilomon.conf
new file mode 100644
index 0000000..b5b2e9c
--- /dev/null
+++ b/recipes-test/cukinia/files/tssilomon.conf
@@ -0,0 +1 @@
+cukinia_process_with_args "/bin/sh /usr/bin/tssilomon"

From b1bb649770cecc63b44d94fd41efd78672cf9619 Mon Sep 17 00:00:00 2001
From: Aaron Brice <aaron@embeddedts.com>
Date: Mon, 24 Aug 2026 19:22:39 +0000
Subject: [PATCH 6/6] tssilomon-start: Don't start with sh

tssilomon is executable with #!/bin/sh.  The explicit running through sh
interferes with the cukinia process test, the process name is "sh"
instead of tssilomon.

Signed-off-by: Aaron Brice <aaron@embeddedts.com>
---
 recipes-extended/tssilomon-start/files/tssilomon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/tssilomon-start/files/tssilomon b/recipes-extended/tssilomon-start/files/tssilomon
index 3f0bbd0..e195613 100644
--- a/recipes-extended/tssilomon-start/files/tssilomon
+++ b/recipes-extended/tssilomon-start/files/tssilomon
@@ -9,12 +9,12 @@ umask 077
 
 start() {
 	printf 'Starting %s: ' "$DAEMON"
-	start-stop-daemon -S -q -m -p /var/run/tssilomon.pid -b --exec sh @BINDIR@/tssilomon
+	start-stop-daemon -S -q -m -p /var/run/tssilomon.pid -b --exec @BINDIR@/tssilomon
 	echo "OK"
 }
 stop() {
 	printf 'Stopping %s: ' "$DAEMON"
-	start-stop-daemon -K -q -m -p /var/run/tssilomon.pid -b --exec sh @BINDIR@/tssilomon
+	start-stop-daemon -K -q -m -p /var/run/tssilomon.pid -b --exec @BINDIR@/tssilomon
 	echo "OK"
 }
 restart() {