Bump to 2024.08 (#164)

* remove dhcpcd patch, bump to intermedate 2024.05, builds

* builds on 6.6 with bumped hash

requires patch to nrc source, which requires no submodule

* Bump calypso to cmdline args

* switch to rc2

* fix nrc

* remove warning breaking parse script

* bump version to release

* final whitespace fixes

* fix iroh inclusion of correct files

.gitmodules

@@ -1,11 +1,3 @@
-[submodule "odysseus_tree/sources/nrc7292_sw_pkg"]
-	path = odysseus_tree/sources/nrc7292_sw_pkg
-	url = https://github.com/newracom/nrc7292_sw_pkg
-        branch = v1.5
-[submodule "odysseus_tree/sources/nrc7394_sw_pkg"]
-	path = odysseus_tree/sources/nrc7394_sw_pkg
-	url = https://github.com/newracom/nrc7394_sw_pkg
-	branch = v1.2.1
 [submodule "odysseus_tree/sources/Nero-2.0"]
 	path = odysseus_tree/sources/Nero-2.0
 	url = https://github.com/Northeastern-Electric-Racing/Nero-2.0

Dockerfile

@@ -38,7 +38,7 @@ RUN apt-get update && apt-get install -y \
 # add all buildroot files there
 WORKDIR /home/odysseus/build
 
-RUN  git clone https://gitlab.com/buildroot.org/buildroot.git && cd ./buildroot && git checkout 2024.02
+RUN  git clone https://gitlab.com/buildroot.org/buildroot.git && cd ./buildroot && git checkout 2024.08
 
 
 WORKDIR /home/odysseus/outputs/

compose.yml

@@ -18,7 +18,6 @@ services:
             - ./outputs:/home/odysseus/outputs
             - ./.git:/home/odysseus/build/githistory/.git:ro # read only as this is an unsafe operation
         environment:
-            - FORCE_UNSAFE_CONFIGURE=1  # for tar configure as root user
             - BR2_DL_DIR=/home/odysseus/shared_data/dl 
             - BR2_CCACHE_DIR=/home/odysseus/shared_data/ccache
             - ODY_TPU_ROOT_PASSWORD=password

odysseus_tree/configs/raspberrypi3_64_ap_defconfig

@@ -14,10 +14,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="AP"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,e755aa122bda2a684476d047d21f6c5aac15f21c)/linux-e755aa122bda2a684476d047d21f6c5aac15f21c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y

odysseus_tree/configs/raspberrypi3_64_iroh_defconfig

@@ -2,24 +2,24 @@ BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_CCACHE=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ODY_TREE_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ODY_TREE_PATH)/patches board/raspberrypi/patches"
 BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_TARGET_GENERIC_HOSTNAME="raspberrypi-iroh"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_ROOT_PASSWD="$(ODY_IROH_ROOT_PASSWORD)"
 # BR2_TARGET_GENERIC_GETTY is not set
 BR2_TARGET_TZ_INFO=y
 BR2_TARGET_LOCALTIME="America/New_York"
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_ODY_TREE_PATH)/overlays/rootfs_overlay_iroh"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_ODY_TREE_PATH)/overlays/rootfs_overlay_common $(BR2_EXTERNAL_ODY_TREE_PATH)/overlays/rootfs_overlay_iroh"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_ODY_TREE_PATH)/post-build-os-release.sh $(BR2_EXTERNAL_ODY_TREE_PATH)/post-build-base-connect.sh board/raspberrypi3-64/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="IROH"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,e755aa122bda2a684476d047d21f6c5aac15f21c)/linux-e755aa122bda2a684476d047d21f6c5aac15f21c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y

odysseus_tree/configs/raspberrypi4_64_nero_debug_defconfig

@@ -3,7 +3,7 @@ BR2_cortex_a72=y
 BR2_ARM_FPU_VFPV4=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_CCACHE=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ODY_TREE_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ODY_TREE_PATH)/patches board/raspberrypi/patches"
 BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_PACKAGE_DEJAVU=y
 # BR2_PACKAGE_DEJAVU_SANS is not set

odysseus_tree/configs/raspberrypi4_64_tpu_defconfig

@@ -3,7 +3,7 @@ BR2_cortex_a72=y
 BR2_ARM_FPU_VFPV4=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_CCACHE=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ODY_TREE_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ODY_TREE_PATH)/patches board/raspberrypi/patches"
 BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_TARGET_GENERIC_HOSTNAME="raspberrypi-sta"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -17,10 +17,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="TPU"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,e755aa122bda2a684476d047d21f6c5aac15f21c)/linux-e755aa122bda2a684476d047d21f6c5aac15f21c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -49,8 +49,8 @@ BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="$(BR2_EXTERNAL_ODY_TREE_PATH)/board/tpu/co
 BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="$(BR2_EXTERNAL_ODY_TREE_PATH)/board/tpu/cmdline.txt"
 BR2_PACKAGE_GPSD=y
 BR2_PACKAGE_GPSD_DEVICES="/dev/ttyAMA5 /dev/pps0"
-BR2_PACKAGE_GPSD_PYTHON=y
 BR2_PACKAGE_GPSD_UBX=y
+BR2_PACKAGE_GPSD_PYTHON=y
 BR2_PACKAGE_LM_SENSORS=y
 BR2_PACKAGE_PPS_TOOLS=y
 BR2_PACKAGE_RASPI_GPIO=y

odysseus_tree/overlays/rootfs_overlay_iroh/etc/init.d/S76calypso

@@ -3,15 +3,15 @@
 PIDFILE=/var/run/calypso.pid
 EXECUTABLE=/usr/bin/calypso
 INTERFACE_NAME=can0
-BROKER_IP=192.168.100.1:1883
+BROKER_IP="192.168.100.1:1883"
 
 case "$1" in
   start)
     echo "Sleeping, waiting to start"
     sleep 20s
     echo "Starting calypso..."
     # start (S) executable (x) in background (b), make pid file (m) at p
-    start-stop-daemon -S -x "$EXECUTABLE" -b -m -p "$PIDFILE" -- mqtt $BROKER_IP $INTERFACE_NAME skip_can_configure
+    start-stop-daemon -S -x "$EXECUTABLE" -b -m -p "$PIDFILE" -- -u $BROKER_IP -c $INTERFACE_NAME
     ;;
   stop)
     echo "Stopping calypso..."

odysseus_tree/package/calypso/S76calypso

@@ -3,13 +3,13 @@
 PIDFILE=/var/run/calypso.pid
 EXECUTABLE=/usr/bin/calypso
 INTERFACE_NAME=can0
-BROKER_IP=localhost:1883
+BROKER_IP="localhost:1883"
 
 case "$1" in
   start)
     echo "Starting calypso..."
     # start (S) executable (x) in background (b), make pid file (m) at p
-    start-stop-daemon -S -x "$EXECUTABLE" -b -m -p "$PIDFILE" -- $BROKER_IP $INTERFACE_NAME
+    start-stop-daemon -S -x "$EXECUTABLE" -b -m -p "$PIDFILE" -- -u $BROKER_IP -c $INTERFACE_NAME -e
     ;;
   stop)
     echo "Stopping calypso..."

odysseus_tree/package/calypso/calypso.mk

@@ -1,4 +1,4 @@
-CALYPSO_VERSION = 4cc0526e0f59748359efb8127dabd5468cab9b05
+CALYPSO_VERSION = 27aec3ffe8d86e825e75783ae8e5fd3d132c39ab
 CALYPSO_SITE_METHOD = git
 CALYPSO_SITE = https://github.com/Northeastern-Electric-Racing/Calypso
 CALYPSO_GIT_SUBMODULES = YES

odysseus_tree/package/nanomq/nanomq.mk

@@ -44,8 +44,8 @@ NANOMQ_CONF_OPTS += -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER
 # Must remove trailing hyphen
 # See https://github.com/microsoft/msquic/blob/93ea72460fd6d7127d8dcfcc7a8b7e2e2acc914b/submodules/CMakeLists.txt#L228
 NANOMQ_PRIVATE_ARCH=arm64
-$(info Using this toolchain for openssl module-> $(notdir $(TARGET_CROSS:-=)))
-$(warning Using $(NANOMQ_PRIVATE_ARCH) for openssl module! Must change via edit!:)
+#$(info Using this toolchain for openssl module-> $(notdir $(TARGET_CROSS:-=)))
+#$(warning Using $(NANOMQ_PRIVATE_ARCH) for openssl module! Must change via edit!:)
 NANOMQ_CONF_OPTS += -DONEBRANCH=YES -DCMAKE_TARGET_ARCHITECTURE=$(NANOMQ_PRIVATE_ARCH) -DGNU_MACHINE=$(notdir $(TARGET_CROSS:-=)) -DFLOAT_ABI_SUFFIX=""
 # since nanomq expects ./build for the cmake dir, but buildroot uses ./buildroot-build, symlink them before doing anything
 define NANOMQ_OPENSSL_FIXUP

odysseus_tree/package/nrc-cli/nrc-cli.mk

@@ -1,14 +1,14 @@
-NRC_CLI_VERSION = 1.5
-NRC_CLI_SITE = $(BR2_EXTERNAL_ODY_TREE_PATH)/sources/nrc7292_sw_pkg/package/src/cli_app
-NRC_CLI_SITE_METHOD = local
+NRC_CLI_VERSION = v1.5
+NRC_CLI_SITE = https://github.com/newracom/nrc7292_sw_pkg
+NRC_CLI_SITE_METHOD = git
 NRC_CLI_LICENSE = Proprietary
 
 define NRC_CLI_BUILD_CMDS
-   $(MAKE) $(TARGET_CONFIGURE_OPTS) all -C $(@D)
+   $(MAKE) $(TARGET_CONFIGURE_OPTS) all -C $(@D)/package/src/cli_app
 endef
 
 define NRC_CLI_INSTALL_TARGET_CMDS
-   $(INSTALL) -D -m 0755 $(@D)/cli_app $(TARGET_DIR)/usr/bin
+   $(INSTALL) -D -m 0755 $(@D)/package/src/cli_app/cli_app $(TARGET_DIR)/usr/bin
 endef
 
 $(eval $(generic-package))

odysseus_tree/package/nrc7292/nrc7292.mk

@@ -1,16 +1,17 @@
 NRC7292_PROVIDER_PROVIDES = nrc-module
 # match upstream sw_pkg version
-NRC7292_VERSION = 1.5
-NRC7292_SITE = $(BR2_EXTERNAL_ODY_TREE_PATH)/sources/nrc7292_sw_pkg/package/src/nrc
-NRC7292_SITE_METHOD = local
+NRC7292_VERSION = v1.5
+NRC7292_SITE = https://github.com/newracom/nrc7292_sw_pkg
+NRC7292_SITE_METHOD = git
 NRC7292_LICENSE = LGPLv2.1/GPLv2
 
+NRC7292_MODULE_SUBDIRS = "package/src/nrc"
 # set the makefile KDIR to buildroot kernel, as otherwise it will use host headers
 NRC7292_MODULE_MAKE_OPTS = KDIR=$(LINUX_DIR)
 
 # set custom bd file to default (evk) if unset, also set firmware file (unchainging)
-BR2_PACKAGE_NRC7292_CUSTOM_BD_FILE ?=  $(BR2_EXTERNAL_ODY_TREE_PATH)/sources/nrc7292_sw_pkg/package/evk/binary/nrc7292_bd.dat
-NRC7292_FIRMWARE_FILE = $(BR2_EXTERNAL_ODY_TREE_PATH)/sources/nrc7292_sw_pkg/package/evk/binary/nrc7292_cspi.bin
+BR2_PACKAGE_NRC7292_CUSTOM_BD_FILE ?=  $(@D)/package/evk/binary/nrc7292_bd.dat
+NRC7292_FIRMWARE_FILE = $(@D)/package/evk/binary/nrc7292_cspi.bin
 
 define NRC7292_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(BR2_PACKAGE_NRC7292_CUSTOM_BD_FILE) $(TARGET_DIR)/lib/firmware/nrc7292_bd.dat

odysseus_tree/package/nrc7394/nrc7394.mk

@@ -1,10 +1,11 @@
 NRC7394_PROVIDER_PROVIDES = nrc-module
 # match upstream sw_pkg version
-NRC7394_VERSION = 1.2
-NRC7394_SITE = $(BR2_EXTERNAL_ODY_TREE_PATH)/sources/nrc7394_sw_pkg/package/src/nrc
-NRC7394_SITE_METHOD = local
+NRC7394_VERSION = v1.2
+NRC7394_SITE = https://github.com/newracom/nrc7292_sw_pkg
+NRC7394_SITE_METHOD = git
 NRC7394_LICENSE = LGPLv2.1/GPLv2
 
+NRC7292_MODULE_SUBDIRS = "package/src/nrc"
 # set the makefile KDIR to buildroot kernel, as otherwise it will use host headers
 NRC7394_MODULE_MAKE_OPTS = KDIR=$(LINUX_DIR)