Updates for wrynose LTS release

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}/"

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

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

recipes-bsp/idleinject-start/idleinject-start.bb

@@ -7,17 +7,20 @@ 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
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/idleinject.service
+        install -m 0644 ${UNPACKDIR}/idleinject.service ${D}${systemd_unitdir}/system
+        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 ${WORKDIR}/idleinject ${D}${sysconfdir}/init.d/idleinject
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${sysconfdir}/init.d/idleinject
+        install -m 0744 ${UNPACKDIR}/idleinject ${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
@@ -27,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"

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

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/*"

recipes-bsp/u-boot-distroboot-scripts/files/boot-ts7180.source

@@ -0,0 +1 @@
+boot-ts7100.source

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,17 +10,21 @@ DEPENDS += "u-boot-mkimage-native"
 
 SRC_URI = "\
     file://boot-ts7100.source \
+    file://boot-ts7180.source \
     file://boot-ts7250v3.source \
     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

recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb

@@ -39,17 +39,17 @@ 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"
-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"
 
 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
@@ -65,7 +65,7 @@ do_configure () {
 }
 
 export EXTRA_CFLAGS = "${CFLAGS}"
-export BINDIR = "${base_sbindir}"
+export BINDIR = "${sbindir}"
 
 do_compile () {
 	unset CFLAGS CPPFLAGS CXXFLAGS
@@ -74,23 +74,23 @@ 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 ${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} () {

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/"

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/"

recipes-devtools/zpu/zpu-elf-gcc-native_3.4.2.bb

@@ -7,39 +7,19 @@ 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/"
-		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

recipes-extended/ts4100-utils/ts4100-utils_2.0.0.bb

@@ -8,16 +8,14 @@ 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/
+# 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
@@ -36,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"

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

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

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

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

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() {

recipes-extended/tssilomon-start/tssilomon-start.bb

@@ -9,15 +9,18 @@ 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
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/tssilomon.service
+        install -m 0644 ${UNPACKDIR}/tssilomon.service ${D}${systemd_unitdir}/system
+        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 ${WORKDIR}/tssilomon ${D}${sysconfdir}/init.d/tssilomon
-        sed -i -e 's#@BINDIR@#${base_bindir}#g' ${D}${sysconfdir}/init.d/tssilomon
+        install -m 0744 ${UNPACKDIR}/tssilomon ${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
@@ -27,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}"

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/