diff --git a/Dockerfile.agnos b/Dockerfile.agnos index e6da9bf..cd438b1 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -47,10 +47,6 @@ FROM agnos-compiler as agnos-compiler-mapbox-gl-native COPY ./userspace/compile-mapbox-gl-native.sh /tmp/agnos/ RUN /tmp/agnos/compile-mapbox-gl-native.sh -FROM agnos-compiler as agnos-compiler-qtlocation -COPY ./userspace/compile-qtlocation.sh /tmp/agnos/ -RUN /tmp/agnos/compile-qtlocation.sh - # ################### # # ###### AGNOS ###### # # ################### # @@ -75,8 +71,7 @@ RUN /tmp/agnos/openpilot_python_dependencies.sh # Use other pre-compiled packages COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb -COPY --from=agnos-compiler-qtlocation /tmp/qtlocation.deb /tmp/qtlocation.deb -RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb ./qtlocation.deb +RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb COPY --from=agnos-compiler-mapbox-gl-native /tmp/libqmapboxgl.so /lib/aarch64-linux-gnu/libqmapboxgl.so # Install openpilot python packages diff --git a/userspace/compile-qtlocation.sh b/userspace/compile-qtlocation.sh deleted file mode 100755 index d6a54ee..0000000 --- a/userspace/compile-qtlocation.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e - -# Build qtlocation with extra api responses parsed -cd /tmp -git clone https://github.com/commaai/qtlocation.git -cd qtlocation -git checkout d44ce6506d2dda542eb8e4b6fc06a6a6bf74bb48 -qmake -make -j$(nproc) - -checkinstall -yD --install=no --pkgname=qtlocation --pkgversion=0.0.1 -cp qtlocation*.deb /tmp/qtlocation.deb