Update openembedded to kirkstone/tdx 6.3.0 (#110)

Updates the system to toradex upstream 6.3.0, including
- update submodules to toradex 6.3.0
- update jupyter to 2022.2
- update python to 3.10
- update setuptools to 62.3.1

Add the recipe from openembedded-core upstream (version unclear, maybe
mickledore) for setuptools 62.3.1, since there are some python packages
- specifically kiwisolver from meta-openembedded and argon2-cffi from
meta-jupyter - that require more recent setuptools to generate proper
dist-infos. Without it, with just the version in openembedded-core, they
generate dist-infos that are UNKNOWN-0.0.0 and conflict with each other
during image install. With 62.3.1, they generate kiwisolver-0.0.0 and
argon2-cffi-0.0.0, which is still annoying but okay for now.

- actually turn on the gpu

Why was this not in the examples and why did we think it was fine to not
have it

---------

Co-authored-by: Seth Foster <[email protected]>

.gitignore

@@ -4,7 +4,7 @@
 tmp/
 
 build/
--build/conf
+-build/conf/
 downloads/
 sstate-cache/
 

.gitmodules

@@ -1,7 +1,6 @@
 [submodule "layers/meta-freescale"]
 	path = layers/meta-freescale
-	url = https://github.com/Opentrons/meta-freescale.git
-	branch = dunfell-fix-gtk
+	url = https://github.com/Freescale/meta-freescale.git
 [submodule "layers/meta-freescale-3rdparty"]
 	path = layers/meta-freescale-3rdparty
 	url = https://github.com/Freescale/meta-freescale-3rdparty
@@ -26,9 +25,6 @@
 [submodule "layers/meta-toradex-nxp"]
 	path = layers/meta-toradex-nxp
 	url = https://git.toradex.com/meta-toradex-nxp.git
-[submodule "layers/meta-toradex-tegra"]
-	path = layers/meta-toradex-tegra
-	url = https://git.toradex.com/meta-toradex-tegra.git
 [submodule "layers/meta-yocto"]
 	path = layers/meta-yocto
 	url = https://git.yoctoproject.org/git/meta-yocto

Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get update \
     build-essential chrpath socat cpio python python3-pexpect \
     xz-utils debianutils iputils-ping python3-git python3-jinja2 \
     libegl1-mesa libsdl1.2-dev  pylint3 xterm tar locales curl git sudo \
-    clang cmake
+    clang cmake zstd lz4
 
 # By default, Ubuntu uses dash as an alias for sh. Dash does not support the source command
 # needed for setting up the build environment in CMD. Use bash as an alias for sh.

build/conf/bblayers.conf

@@ -11,7 +11,6 @@ BBLAYERS ?= " \
   ${TOPDIR}/../layers/meta-toradex-nxp \
   ${TOPDIR}/../layers/meta-freescale \
   ${TOPDIR}/../layers/meta-freescale-3rdparty \
-  ${TOPDIR}/../layers/meta-toradex-tegra \
   ${TOPDIR}/../layers/meta-toradex-bsp-common \
   ${TOPDIR}/../layers/meta-openembedded/meta-oe \
   ${TOPDIR}/../layers/meta-openembedded/meta-filesystems \

build/conf/local.conf

@@ -149,11 +149,7 @@ EXTRA_IMAGE_FEATURES ?= "package-management"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
-#   - 'image-prelink' in order to prelink the filesystem image
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats"
 
 #
 # Runtime testing of images
@@ -199,10 +195,10 @@ BB_DISKMON_DIRS ??= "\
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
     STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K \
+    HALT,/tmp,10M,1K"
 
 #
 # Shared-state files from other locations
@@ -230,8 +226,8 @@ BB_DISKMON_DIRS ??= "\
 # seen. The two lines below enable the SDL backend too. By default libsdl2-native will
 # be built, if you want to use your host's libSDL instead of the minimal libsdl built
 # by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
-PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
 #ASSUME_PROVIDED += "libsdl2-native"
 
 #
@@ -260,7 +256,7 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
 # Delete the the source/object/binary files once a package is built to preserve disk space
 INHERIT += "rm_work"
@@ -287,3 +283,5 @@ YARN_CACHE_DIR = ""
 ELECTRON_CACHE_DIR = ""
 SIGNING_KEY = ""
 DATADOG_API_KEY = ""
+
+PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"

layers/meta-opentrons/classes/pipenv_app_bundle.bbclass

@@ -1,10 +1,10 @@
 # pipenv_app_bundle.bbclass: Install python applications described by
 # pipenv projects as directories in /opt (or anywhere, really)
 
-inherit distutils3-base
+inherit setuptools3-base
 
 DEPENDS += "python3 python3-native python3-pip-native python3-micropipenv-native "
-RDEPENDS_${PN} += " python3 python3-modules"
+RDEPENDS:${PN} += " python3 python3-modules"
 
 # directory for version file output
 SYSROOT_DIRS += "/opentrons_versions"
@@ -132,7 +132,7 @@ do_rewrite_requirements[vardeps] += " PIPENV_APP_BUNDLE_USE_GLOBAL PIPENV_APP_BU
 
 addtask do_rewrite_requirements after do_configure before do_compile
 
-do_configure_prepend () {
+do_configure:prepend () {
    cd ${PIPENV_APP_BUNDLE_PROJECT_ROOT}
    bbplain "Running micropipenv in ${PIPENV_APP_BUNDLE_PROJECT_ROOT}"
    if [[ "${PIPENV_APP_BUNDLE_STRIP_HASHES}" = "no" ]] ; then
@@ -202,4 +202,4 @@ do_install () {
 }
 
 
-FILES_${PN} = "${PIPENV_APP_BUNDLE_DIR} opentrons_versions"
+FILES:${PN} = "${PIPENV_APP_BUNDLE_DIR} opentrons_versions"

layers/meta-opentrons/conf/distro/opentrons.conf

@@ -4,7 +4,7 @@ DISTRO = "opentrons"
 DISTRO_NAME = "Opentrons (Opentrons OT3 Distro)"
 DISTRO_VERSION = "0.0.1"
 DISTRO_CODENAME = "ot3"
-DISTRO_FEATURES_append = " systemd wifi bluetooth"
+DISTRO_FEATURES:append = " systemd wifi bluetooth"
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
@@ -13,3 +13,5 @@ PREFERRED_VERSION_icu = "69.1"
 PREFERRED_VERSION_c-ares = "1.17.1"
 PREFERRED_VERSION_libical = "3.0.10"
 PREFERRED_VERSION_python3-pyjwt = "2.6.0"
+PREFERRED_VERSION_python3-setuptools = "62.3.1"
+PREFERRED_VERSION_python3-jupyter-packaging = "0.12.0"

layers/meta-opentrons/conf/layer.conf

@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "meta-opentrons"
 BBFILE_PATTERN_meta-opentrons = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-opentrons = "6"
+BBFILE_PRIORITY_meta-opentrons = "8"
 
 LAYERDEPENDS_meta-opentrons = "core"
-LAYERSERIES_COMPAT_meta-opentrons = "dunfell"
+LAYERSERIES_COMPAT_meta-opentrons = "kirkstone"

layers/meta-opentrons/conf/machine/verdin-imx8mm.conf

@@ -12,26 +12,33 @@ IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
 # override imx-base.inc which sets this to cortexa53-crypto
-DEFAULTTUNE_mx8mm = "aarch64"
-require conf/machine/include/tune-cortexa53.inc
+DEFAULTTUNE:mx8mm-generic-bsp = "armv8a-crypto"
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 KERNEL_DEVICETREE = " \
     freescale/imx8mm-verdin-nonwifi-dahlia.dtb \
     freescale/imx8mm-verdin-nonwifi-dev.dtb \
     freescale/imx8mm-verdin-wifi-dahlia.dtb \
     freescale/imx8mm-verdin-wifi-dev.dtb \
 "
-KERNEL_IMAGETYPE_aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "verdin-imx8mm_defconfig,sdcard"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
-UBOOT_ENTRYPOINT = "0x40280000"
-UBOOT_DTB_LOADADDRESS = "0x43000000"
-UBOOT_DTBO_LOADADDRESS = "0x46000000"
+# evaluate - these are more recent from meta-toradex-nxp
+#UBOOT_DTB_LOADADDRESS:mx8mm-generic-bsp = "0x50200000"
+#UBOOT_DTBO_LOADADDRESS:mx8mm-generic-bsp = "0x50240000"
+#UBOOT_ENTRYPOINT:mx8mm-generic-bsp  = "0x48200000"
+#UBOOT_RD_LOADADDRESS = "0x52300000"
+
+# evaluate - these are the older values from dunfell
+UBOOT_ENTRYPOINT:mx8mm-generic-bsp = "0x40280000"
+UBOOT_DTB_LOADADDRESS:mx8mm-generic-bsp = "0x43000000"
+UBOOT_DTBO_LOADADDRESS:mx8mm-generic-bsp = "0x46000000"
 UBOOT_RD_LOADADDRESS = "0x60000000"
 
 # Set DDR FIRMWARE
@@ -42,11 +49,15 @@ UBOOT_DTB_NAME = "imx8mm-verdin.dtb"
 
 BOOT_SPACE = "65536"
 
+ATF_PLATFORM = "imx8mm"
+SOC_ATF_BOOT_UART_BASE:verdin-imx8mm = "0x30860000"
+
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_evk_emmc_fastboot"
+IMX_BOOT_SOC_TARGET = "iMX8MM"
 
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 LOADADDR = ""
@@ -58,33 +69,46 @@ SERIAL_CONSOLES = "115200;ttymxc0"
 
 MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usbhost vfat wifi"
 
-
-# Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d"
+# handle machine firmware
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d"
+MACHINE_FIRMWARE:append = " linux-firmware-sd8997"
+MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt"
+PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+MACHINE_EXTRA_RRECOMMENDS:append:use-mainline-bsp = " modprobe-conf"
+IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
+# Currently we use the nxp 2022.04 downstream for mx8
+PREFERRED_VERSION_u-boot-toradex = "2022.04"
+
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 
-# Currently we use the nxp 2020.04 downstream for mx8 as some features are
-# not yet available in 2020.07.
-PREFERRED_VERSION_u-boot-toradex = "2020.04%"
 # Updated gdk-pixbuf required for electron >=19
 PREFERRED_VERSION_gdk-pixbuf = "2.42.9"
-PREFERRED_VERSION_meson-native = "0.55.3"
-MACHINE_FIRMWARE_append = " linux-firmware-sd8997"
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
 PREFERRED_VERSION_cmake-native = "3.22.3"
 
 BOARD_TYPE = "verdin"
 
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES += "teziimg"
+
 UBOOT_BINARY_TEZI_EMMC = "imx-boot"
 OFFSET_BOOTROM_PAYLOAD = "2"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "\
   verdin-imx8mm_sn65dsi84-atm0700l61_overlay.dtbo \
-  verdin-imx8mm_sn65dsi84_overlay.dtbo \
+  verdin-imx8mm_gt911_overlay.dtbo \
+  verdin-imx8mm_MCP2518_overlay.dtbo \
+  verdin-imx8mm_force-lcd-on.dtbo \
+  verdin-imx8mm_M24128-eeprom_overlay.dtbo \
+"
+
+TEZI_EXTERNAL_KERNEL_DEVICETREE = "\
+  verdin-imx8mm_sn65dsi84-atm0700l61_overlay.dtbo \
   verdin-imx8mm_gt911_overlay.dtbo \
   verdin-imx8mm_MCP2518_overlay.dtbo \
   verdin-imx8mm_force-lcd-on.dtbo \

layers/meta-opentrons/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_%.bbappend

@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
 	# remove /unit_test dir
 	rm -rf ${D}/unit_tests
 }

layers/meta-opentrons/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend

@@ -1,9 +1,9 @@
-SRC_URI_append = " \
+SRC_URI:append = " \
                file://wrapup-ot3.sh \
 "
 
-FILESEXTRAPATHS_append := ":${THISDIR}/files"
-do_deploy_append () {
+FILESEXTRAPATHS:append := ":${THISDIR}/files"
+do_deploy:append () {
     install -m 644 -T ${WORKDIR}/wrapup-ot3.sh ${DEPLOYDIR}/wrapup.sh
 }
 

layers/meta-opentrons/recipes-bsp/u-boot/u-boot-distro-boot.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-distro-boot:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-distro-boot:"
 
-SRC_URI_append = " file://boot.cmd.in"
+SRC_URI:append = " file://boot.cmd.in"
 

layers/meta-opentrons/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in

@@ -85,7 +85,13 @@ fi
 
 if test ${kernel_image} = "Image.gz"
 then
-    env set kernel_addr_load ${loadaddr}
+    # The default value where this used to get loaded is not suitable because it also gets
+    # used in u-boot/include/configs/verdin-imx8mm.h to initialize kernel_addr_r. This is
+    # where we load a gzip'd kernel, and kernel_addr_r is where we unzip a gzip'd kernel,
+    # so we'll step on our own toes if we try that. Since this is in an else/if with the
+    # only place we use a ramdisk, we can't overlap with using a ramdisk, and the ramdisk
+    # load address is a safe place to use as scratch space for loading a kernel.
+    env set kernel_addr_load ${ramdisk_addr_r}
     env set bootcmd_unzip 'unzip ${kernel_addr_load} ${kernel_addr_r}'
 else
     env set bootcmd_unzip ';'

layers/meta-opentrons/recipes-bsp/u-boot/u-boot-toradex/0001-verdin_imx8mm-remove-default-setup-args.patch

@@ -1,26 +1,27 @@
-From c52a1c4f09148a9ee3c66fb75dcccfbbfefb3788 Mon Sep 17 00:00:00 2001
+From 58618bd340d27d231034d96e924c5913a20ad8bc Mon Sep 17 00:00:00 2001
 From: Seth Foster <[email protected]>
-Date: Mon, 13 Mar 2023 15:37:59 +0000
+Date: Wed, 18 Oct 2023 15:53:11 +0000
 Subject: [PATCH] verdin_imx8mm: remove default setup args
 
 The default setup arguments compiled into u-boot hardcoded
 a video console. We want that to be a splash screen, and we
 don't want to deal with the defaults being wrong, so remove
 the default setting and we'll set it in the boot script.
 ---
- include/configs/verdin-imx8mm.h | 1 -
- 1 file changed, 1 deletion(-)
+ include/configs/verdin-imx8mm.h | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
-index 87e73c26a7..83ab2cf43b 100644
+index 0d77657978..65650d0b40 100644
 --- a/include/configs/verdin-imx8mm.h
 +++ b/include/configs/verdin-imx8mm.h
-@@ -120,7 +120,6 @@
- 	"boot_scripts=" BOOT_SCRIPT "\0" \
- 	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
- 	"boot_file=Image\0" \
--	"setup=setenv setupargs console=tty1 console=${console},${baudrate} consoleblank=0 earlycon\0" \
- 	"update_uboot=askenv confirm Did you load imx-boot (y/N)?; " \
+@@ -60,8 +60,6 @@
+ 	"fdt_board=dev\0" \
+ 	"initrd_addr=0x43800000\0" \
+ 	"initrd_high=0xffffffffffffffff\0" \
+-	"setup=setenv setupargs console=tty1 console=${console},${baudrate} " \
+-		"consoleblank=0 earlycon\0" \
+ 	"update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \
  		"if test \"$confirm\" = \"y\"; then " \
  		"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
 -- 

layers/meta-opentrons/recipes-bsp/u-boot/u-boot-toradex_%.bbappend

@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-toradex:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-toradex:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
      file://0001-verdin_imx8mm-remove-default-setup-args.patch \
 "