Skip to content

Commit 7906df0

Browse files
authored
FHE 2026 and post updates, sync-up (#268)
* update to br 2026.5 rc1 * try this patch * oops * kernel push * fix pi 3 defconfig * remove dma alignment patch * try 6.12 patch nrc * try 6.12 patch nrc 2 * new networking, some lte utils * attempt to use mbox * update nrc patch * settings for this year * another fix * another fix * mvp lte * disable nrc, fix mosquitto * ap * ap full config test * wheel password * take wheel pwd * oops * balnking * oops * oops and perms
1 parent 89c8648 commit 7906df0

34 files changed

Lines changed: 782 additions & 393 deletions

.github/workflows/build_image.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ jobs:
5151
ODY_AP_ROOT_PASSWORD: ${{ secrets.ODY_AP_ROOT_PASSWORD }}
5252
ODY_TPU_ROOT_PASSWORD: ${{ secrets.ODY_TPU_ROOT_PASSWORD }}
5353
ODY_WHEEL_ROOT_PASSWORD: ${{ secrets.ODY_WHEEL_ROOT_PASSWORD }}
54+
ODY_WHEEL_AP_PASSWORD: ${{ secrets.ODY_WHEEL_AP_PASSWORD }}
5455
ODY_IROH_ROOT_PASSWORD: ${{ secrets.ODY_IROH_ROOT_PASSWORD }}
5556
MASTER_PASSWORD: ${{ secrets.ODY_MASTER_PASSWORD }}
56-
run: for i in ODY_AP_ROOT_PASSWORD ODY_TPU_ROOT_PASSWORD ODY_WHEEL_ROOT_PASSWORD ODY_IROH_ROOT_PASSWORD ODY_BASE_WIFI_PASSWORD ODY_BASE_FIELD_WIFI_PASSWORD; do echo "$i=${!i}" >> SECRETS.env; done; echo "" >> SECRETS.env; gpg --batch --symmetric --passphrase "$MASTER_PASSWORD" --no-symkey-cache --cipher-algo AES256 SECRETS.env
57+
run: for i in ODY_AP_ROOT_PASSWORD ODY_TPU_ROOT_PASSWORD ODY_WHEEL_ROOT_PASSWORD ODY_WHEEL_AP_PASSWORD ODY_IROH_ROOT_PASSWORD ODY_BASE_WIFI_PASSWORD ODY_BASE_FIELD_WIFI_PASSWORD; do echo "$i=${!i}" >> SECRETS.env; done; echo "" >> SECRETS.env; gpg --batch --symmetric --passphrase "$MASTER_PASSWORD" --no-symkey-cache --cipher-algo AES256 SECRETS.env
5758
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
5859
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
5960
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ RUN apt-get update && apt-get install -y \
3737

3838
# add all buildroot files there
3939
WORKDIR /home/odysseus/build
40-
41-
RUN git clone https://gitlab.com/buildroot.org/buildroot.git && cd ./buildroot && git checkout 2025.11.1 && curl https://patchwork.ozlabs.org/series/460278/mbox/ | git apply
40+
RUN git clone https://gitlab.com/buildroot.org/buildroot.git && cd ./buildroot && git checkout 2026.05-rc1 && curl https://patchwork.ozlabs.org/series/504330/mbox/ | git apply
4241

4342

4443
WORKDIR /home/odysseus/outputs/

compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
odysseus:
33
build: .
4-
image: ghcr.io/northeastern-electric-racing/odysseus:develop-stability-and-improvements
4+
image: ghcr.io/northeastern-electric-racing/odysseus:fhe-25-static
55
command: /bin/bash
66
tty: true
77
stdin_open: true
@@ -24,6 +24,7 @@ services:
2424
- ODY_AP_ROOT_PASSWORD=password
2525
- ODY_BASE_WIFI_PASSWORD=password
2626
- ODY_WHEEL_ROOT_PASSWORD=password
27+
- ODY_WHEEL_AP_PASSWORD=password
2728
volumes:
2829
shared_data:
2930
labels:

docker_scripts/setup_env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ alias load-secrets="source /home/odysseus/scripts/load-secrets.sh"
55

66
# for each defconfig make output subdirectory
77
make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/tpu BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypi4_64_tpu_defconfig
8-
make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/ap-pi4 BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypi4_64_ap_defconfig
98
make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/iroh BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypi3_64_iroh_defconfig
109
make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/ap-pi5 BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypi5_ap_defconfig
1110
make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/tpu-cm5 BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypicm5io_tpu_defconfig

odysseus_tree/configs/raspberrypi3_64_iroh_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
1717
BR2_ROOTFS_POST_SCRIPT_ARGS="IROH"
1818
BR2_LINUX_KERNEL=y
1919
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
20-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,bba53a117a4a5c29da892962332ff1605990e17a)/linux-bba53a117a4a5c29da892962332ff1605990e17a.tar.gz"
21-
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
20+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
21+
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
2222
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2323
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
2424
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y

odysseus_tree/configs/raspberrypi4_64_ap_defconfig

Lines changed: 0 additions & 83 deletions
This file was deleted.

odysseus_tree/configs/raspberrypi4_64_tpu_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
1818
BR2_ROOTFS_POST_SCRIPT_ARGS="TPU"
1919
BR2_LINUX_KERNEL=y
2020
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
21-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,bba53a117a4a5c29da892962332ff1605990e17a)/linux-bba53a117a4a5c29da892962332ff1605990e17a.tar.gz"
21+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
2222
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_ODY_TREE_PATH)/linux_patches/nrc_halow"
2323
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
2424
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -57,6 +57,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
5757
BR2_PACKAGE_OPENSSL=y
5858
BR2_PACKAGE_DTC=y
5959
BR2_PACKAGE_DTC_PROGRAMS=y
60+
BR2_PACKAGE_LIBQMI=y
6061
BR2_PACKAGE_X264=y
6162
BR2_PACKAGE_LIBCURL=y
6263
# BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT is not set
@@ -69,6 +70,7 @@ BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y
6970
BR2_PACKAGE_BMON=y
7071
BR2_PACKAGE_CAN_UTILS=y
7172
BR2_PACKAGE_CHRONY=y
73+
BR2_PACKAGE_CLOUDFLARED=y
7274
BR2_PACKAGE_DHCPCD=y
7375
BR2_PACKAGE_DROPBEAR=y
7476
BR2_PACKAGE_ETHTOOL=y

odysseus_tree/configs/raspberrypi5_ap_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh"
1717
BR2_ROOTFS_POST_SCRIPT_ARGS="AP"
1818
BR2_LINUX_KERNEL=y
1919
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
20-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,bba53a117a4a5c29da892962332ff1605990e17a)/linux-bba53a117a4a5c29da892962332ff1605990e17a.tar.gz"
20+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
2121
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_ODY_TREE_PATH)/linux_patches/nrc_halow"
2222
BR2_LINUX_KERNEL_DEFCONFIG="bcm2712"
2323
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment"

odysseus_tree/configs/raspberrypicm5io_wheel_defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_ROOT_PASSWD="$(ODY_WHEEL_ROOT_PASSWORD)"
1212
BR2_TARGET_TZ_INFO=y
1313
BR2_TARGET_LOCALTIME="America/New_York"
1414
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_ODY_TREE_PATH)/overlays/rootfs_overlay_common $(BR2_EXTERNAL_ODY_TREE_PATH)/overlays/rootfs_overlay_wheel"
15-
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/raspberrypicm5io/post-build.sh"
15+
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 $(BR2_EXTERNAL_ODY_TREE_PATH)/post-build-hostapd-pass.sh board/raspberrypicm5io/post-build.sh"
1616
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm5io/post-image.sh"
1717
BR2_ROOTFS_POST_SCRIPT_ARGS="WHEEL"
1818
BR2_LINUX_KERNEL=y
@@ -77,8 +77,11 @@ BR2_PACKAGE_BMON=y
7777
BR2_PACKAGE_CAN_UTILS=y
7878
BR2_PACKAGE_CHRONY=y
7979
BR2_PACKAGE_DHCPCD=y
80+
BR2_PACKAGE_DNSMASQ=y
81+
BR2_PACKAGE_DNSMASQ_CONNTRACK=y
8082
BR2_PACKAGE_DROPBEAR=y
8183
BR2_PACKAGE_GESFTPSERVER=y
84+
BR2_PACKAGE_HOSTAPD=y
8285
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
8386
BR2_PACKAGE_IPERF3=y
8487
BR2_PACKAGE_IPROUTE2=y

odysseus_tree/linux_patches/nrc_halow/01-yeet_dma_align_check.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)