diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base index 8a60412993..6ea1450bee 100644 --- a/Dockerfile.openpilot_base +++ b/Dockerfile.openpilot_base @@ -14,9 +14,7 @@ ENV LC_ALL=en_US.UTF-8 COPY tools/install_ubuntu_dependencies.sh /tmp/tools/ RUN /tmp/tools/install_ubuntu_dependencies.sh && \ - rm -rf /var/lib/apt/lists/* /tmp/* && \ - cd /usr/lib/gcc/arm-none-eabi/* && \ - rm -rf arm/ thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp + rm -rf /var/lib/apt/lists/* /tmp/* ENV NVIDIA_VISIBLE_DEVICES=all ENV NVIDIA_DRIVER_CAPABILITIES=graphics,utility,compute diff --git a/panda b/panda index e1da7dc918..49f72e931f 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit e1da7dc918c0bcda6fbbdd9ee6f89c5428ec5039 +Subproject commit 49f72e931f09ceecb00c0c7937808fcaeecd3c17 diff --git a/pyproject.toml b/pyproject.toml index 5aeb2ffab4..cc56eb3594 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,6 +90,7 @@ testing = [ dev = [ "matplotlib", "opencv-python-headless", + "gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=gcc-arm-none-eabi", ] tools = [ diff --git a/tools/install_ubuntu_dependencies.sh b/tools/install_ubuntu_dependencies.sh index aa98102d49..06ab8fda3a 100755 --- a/tools/install_ubuntu_dependencies.sh +++ b/tools/install_ubuntu_dependencies.sh @@ -36,7 +36,6 @@ function install_ubuntu_common_requirements() { # TODO: vendor the rest of these in third_party/ $SUDO apt-get install -y --no-install-recommends \ - gcc-arm-none-eabi \ capnproto \ libcapnp-dev \ ffmpeg \ diff --git a/tools/mac_setup.sh b/tools/mac_setup.sh index 3f13cbe74a..dece439752 100755 --- a/tools/mac_setup.sh +++ b/tools/mac_setup.sh @@ -35,7 +35,6 @@ brew "ffmpeg" brew "libusb" brew "llvm" brew "zeromq" -cask "gcc-arm-embedded" brew "portaudio" EOS diff --git a/uv.lock b/uv.lock index 8b8bfd639b..aa03f6d5e2 100644 --- a/uv.lock +++ b/uv.lock @@ -416,6 +416,11 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9a/9a/e35b4a917281c0b8419d4207f4334c8e8c5dbf4f3f5f9ada73958d937dcc/frozenlist-1.8.0-py3-none-any.whl", hash = "sha256:0c18a16eab41e82c295618a77502e17b195883241c563b00f0aa5106fc4eaa0d", size = 13409, upload-time = "2025-10-06T05:38:16.721Z" }, ] +[[package]] +name = "gcc-arm-none-eabi" +version = "13.2.1" +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=gcc-arm-none-eabi&rev=releases#e769f658aad6ab46e98490bf0800e69b99e22f7a" } + [[package]] name = "ghp-import" version = "2.1.0" @@ -778,6 +783,7 @@ dependencies = [ [package.optional-dependencies] dev = [ + { name = "gcc-arm-none-eabi" }, { name = "matplotlib" }, { name = "opencv-python-headless" }, ] @@ -816,6 +822,7 @@ requires-dist = [ { name = "crcmod-plus" }, { name = "cython" }, { name = "dearpygui", marker = "(platform_machine != 'aarch64' and extra == 'tools') or (sys_platform != 'linux' and extra == 'tools')", specifier = ">=2.1.0" }, + { name = "gcc-arm-none-eabi", marker = "extra == 'dev'", git = "https://github.com/commaai/dependencies.git?subdirectory=gcc-arm-none-eabi&rev=releases" }, { name = "hypothesis", marker = "extra == 'testing'", specifier = "==6.47.*" }, { name = "inputs" }, { name = "jeepney" },