use new vendored deps from commaai/dependencies (#531)

* sync

* remove apt packages now vendored in commaai/dependencies

- bzip2: commaai/openpilot#37342, commaai/openpilot#37459
- libbz2-dev: commaai/openpilot#37342, commaai/openpilot#37459
- libeigen3-dev: commaai/openpilot#37339
- libzmq3-dev: commaai/openpilot#37333
- libzstd-dev: commaai/openpilot#37376
- zstd: commaai/openpilot#37376
- libssl-dev: commaai/openpilot#37381
- libjpeg-dev: commaai/openpilot#37371, commaai/openpilot#37381
- cppcheck: commaai/openpilot#34248
- gettext: commaai/openpilot#37372

* update

* trim down list

* revert that

* rm old capnp build

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
This commit is contained in:
Shane Smiskol
2026-03-04 09:59:43 -08:00
committed by GitHub
parent 684c6a929c
commit 2d374185aa
6 changed files with 454 additions and 660 deletions

View File

@@ -21,12 +21,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
# Enable ccache
ENV PATH="/usr/lib/ccache:$PATH"
# capnproto
FROM agnos-compiler AS agnos-compiler-capnp
COPY ./userspace/compile-capnp.sh /tmp/agnos/
RUN --mount=type=cache,target=/root/.ccache,id=capnp,sharing=shared \
/tmp/agnos/compile-capnp.sh
# ffmpeg
FROM agnos-compiler AS agnos-compiler-ffmpeg
COPY ./userspace/compile-ffmpeg.sh /tmp/agnos/
@@ -124,10 +118,6 @@ RUN cd /tmp && \
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./libqmi.deb && \
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./modemmanager.deb
# Pre-compiled capnp (must be before python install)
COPY --from=agnos-compiler-capnp /tmp/capnproto.deb /tmp/capnproto.deb
RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./capnproto.deb
# Use other pre-compiled packages
COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb
RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb

View File

@@ -1,23 +0,0 @@
#!/bin/bash -e
VERSION=1.0.2
# Install build requirements
apt-get update && apt-get install -yq --no-install-recommends \
libc6-dev \
libssl-dev \
zlib1g-dev
# Build capnproto
cd /tmp
wget https://capnproto.org/capnproto-c++-${VERSION}.tar.gz
tar xvf capnproto-c++-${VERSION}.tar.gz
cd capnproto-c++-${VERSION}
CXXFLAGS="-fPIC -O2" ./configure
make -j$(nproc)
# remove "--fstrans=no" when checkinstall is fixed (still not fixed in 24.04)
# https://bugs.launchpad.net/ubuntu/+source/checkinstall/+bug/78455
checkinstall -yD --install=no --fstrans=no --pkgname=capnproto
mv capnproto*.deb /tmp/capnproto.deb

View File

@@ -8,36 +8,29 @@ apt-fast install --no-install-recommends -yq \
autoconf \
automake \
build-essential \
bzip2 \
casync \
clang \
clinfo \
cmake \
cppcheck \
curl \
darkstat \
dkms \
gettext \
gpiod \
libarchive-dev \
libass-dev \
libbz2-dev \
libcurl4-openssl-dev \
libczmq-dev \
libdbus-1-dev \
libeigen3-dev \
libffi-dev \
libfreetype6-dev \
libglfw3-dev \
libglib2.0-0t64 \
libi2c-dev \
libjpeg-dev \
liblzma-dev \
libomp-dev \
libportaudio2 \
libsdl2-dev \
libsqlite3-dev \
libssl-dev \
libsystemd-dev \
libtool \
libusb-1.0-0-dev \
@@ -56,8 +49,6 @@ apt-fast install --no-install-recommends -yq \
libxcb-xkb1 \
libxcb1-dev \
libxkbcommon-x11-0 \
libzmq3-dev \
libzstd-dev \
locales \
nethogs \
ocl-icd-libopencl1 \
@@ -69,5 +60,4 @@ apt-fast install --no-install-recommends -yq \
vnstat \
wget \
xvfb \
zlib1g-dev \
zstd
zlib1g-dev

View File

@@ -25,11 +25,24 @@ dependencies = [
"setuptools",
"numpy >=2.0",
# vendored native dependencies
"bzip2 @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=bzip2",
"capnproto @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=capnproto",
"eigen @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=eigen",
"ffmpeg @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=ffmpeg",
"libjpeg @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=libjpeg",
"libyuv @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=libyuv",
"python3-dev @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=python3-dev",
"zstd @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=zstd",
"ncurses @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=ncurses",
"zeromq @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=zeromq",
"git-lfs @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=git-lfs",
"gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=gcc-arm-none-eabi",
# body / webrtcd
"av",
"aiohttp",
"aiortc",
"pyaudio",
# panda
"libusb1",
@@ -60,7 +73,7 @@ dependencies = [
"zstandard",
# ui
#"raylib > 5.5.0.3",
"raylib > 5.5.0.3",
"qrcode",
"jeepney",
]
@@ -94,7 +107,6 @@ dev = [
tools = [
"metadrive-simulator @ git+https://github.com/commaai/metadrive.git@minimal ; (platform_machine != 'aarch64')",
"dearpygui>=2.1.0; (sys_platform != 'linux' or platform_machine != 'aarch64')", # not vended for linux aarch64
]
[project.urls]
@@ -112,7 +124,7 @@ allow-direct-references = true
[tool.pytest.ini_options]
minversion = "6.0"
addopts = "--ignore=openpilot/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=teleoprtc_repo/ --ignore=msgq/ -Werror --strict-config --strict-markers --durations=20 --maxprocesses=8 -n auto --dist=loadgroup"
addopts = "--ignore=openpilot/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=teleoprtc_repo/ --ignore=msgq/ -Werror --strict-config --strict-markers --durations=10 -n auto --dist=loadgroup"
cpp_files = "test_*"
cpp_harness = "selfdrive/test/cpp_harness.py"
python_files = "test_*.py"
@@ -133,7 +145,7 @@ testpaths = [
[tool.codespell]
quiet-level = 3
# if you've got a short variable name that's getting flagged, add it here
ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite"
ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite,ser"
builtin = "clear,rare,informal,code,names,en-GB_to_en-US"
skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.po, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*, docs/assets/*, tools/plotjuggler/layouts/*, selfdrive/assets/offroad/mici_fcc.html"

View File

@@ -6,7 +6,6 @@ requires-python = ">=3.12.3, <3.13"
description = ""
dependencies = [
"openpilot",
"openpilot[dev]",
"openpilot[testing]",
# hardware.py
@@ -14,12 +13,6 @@ dependencies = [
# amplifier.py
"smbus2",
# pandad
"libusb1 == 3.1.0", # recent versions segfault on comma three
# tinygrad
"pyopencl == 2024.1", # pinned until cmake update coming with 24.04
# provisioning
"pyusb",
"paramiko",
@@ -32,7 +25,7 @@ dependencies = [
"flaky",
# GUIs
"raylib @ https://github.com/commaai/raylib-python-cffi/releases/download/8/raylib-5.5.0.2-cp312-cp312-linux_aarch64.whl",
"raylib @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=raylib",
]
[tool.uv.sources]

1038
userspace/uv/uv.lock generated

File diff suppressed because it is too large Load Diff