mirror of
https://github.com/commaai/agnos-builder.git
synced 2026-07-09 16:52:05 +08:00
Remove PyQt5 (#375)
This commit is contained in:
@@ -39,15 +39,6 @@ COPY ./userspace/compile-modemmanager.sh /tmp/agnos/
|
||||
RUN --mount=type=cache,target=/root/.ccache,id=modemmanager,sharing=shared \
|
||||
/tmp/agnos/compile-modemmanager.sh
|
||||
|
||||
# PyQt5
|
||||
FROM agnos-compiler AS agnos-compiler-pyqt5
|
||||
COPY ./userspace/qtwayland/*.deb /tmp/agnos/
|
||||
COPY ./userspace/openpilot_python_dependencies.sh /tmp/agnos/
|
||||
RUN /tmp/agnos/openpilot_python_dependencies.sh
|
||||
COPY ./userspace/compile-pyqt5.sh /tmp/agnos/
|
||||
RUN --mount=type=cache,target=/root/.ccache,id=pyqt5,sharing=shared \
|
||||
/tmp/agnos/compile-pyqt5.sh
|
||||
|
||||
# qtwayland5
|
||||
FROM agnos-compiler AS agnos-compiler-qtwayland5
|
||||
COPY ./userspace/qtwayland/*.deb /tmp/agnos/
|
||||
@@ -136,14 +127,6 @@ RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmp
|
||||
ARG XDG_DATA_HOME="/usr/local"
|
||||
ARG PATH="$XDG_DATA_HOME/.cargo/bin:$PATH"
|
||||
|
||||
# Use pre-compiled PyQt5 wheel
|
||||
COPY --from=agnos-compiler-pyqt5 /tmp/PyQt5-5.15.9/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl /tmp/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl
|
||||
|
||||
RUN export MAKEFLAGS="-j$(nproc)" && \
|
||||
source $XDG_DATA_HOME/venv/bin/activate && \
|
||||
uv pip install pyqt5-sip==12.12.1 && \
|
||||
uv pip install /tmp/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl --verbose --config-settings="--confirm-license="
|
||||
|
||||
# Install openpilot python packages
|
||||
COPY ./userspace/uv /tmp/agnos/uv
|
||||
RUN source $XDG_DATA_HOME/venv/bin/activate && \
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
#!/bin/bash -e
|
||||
|
||||
VERSION=5.15.9
|
||||
|
||||
# Install build dependencies
|
||||
apt-get update && apt-get install -yq --no-install-recommends \
|
||||
libdbus-1-3 \
|
||||
libgles-dev \
|
||||
libglib2.0-dev \
|
||||
libharfbuzz-dev \
|
||||
libpcre2-dev \
|
||||
libpng-dev \
|
||||
libpulse-dev
|
||||
|
||||
apt-get -o Dpkg::Options::="--force-overwrite" install -yq \
|
||||
/tmp/agnos/qt-5.12.8.deb \
|
||||
/tmp/agnos/libwayland-1.9.0-1.deb \
|
||||
/tmp/agnos/libicu66_66.1-2ubuntu2.1_arm64.deb \
|
||||
/tmp/agnos/libssl1.1_1.1.1f-1ubuntu2.22_arm64.deb \
|
||||
/tmp/agnos/libffi6_3.2.1-8_arm64.deb
|
||||
|
||||
source /usr/local/venv/bin/activate
|
||||
|
||||
# Build PyQt5 wheel
|
||||
cd /tmp
|
||||
wget https://files.pythonhosted.org/packages/5c/46/b4b6eae1e24d9432905ef1d4e7c28b6610e28252527cdc38f2a75997d8b5/PyQt5-${VERSION}.tar.gz
|
||||
tar xf PyQt5-${VERSION}.tar.gz
|
||||
cd PyQt5-${VERSION}
|
||||
|
||||
export MAKEFLAGS="-j$(nproc)"
|
||||
pip wheel -w . --verbose --config-settings="--confirm-license=" --config-settings="--build-dir=/tmp/build/" .
|
||||
Reference in New Issue
Block a user