mirror of
https://github.com/commaai/agnos-builder.git
synced 2026-07-11 09:42:06 +08:00
build: remove lpac build and setup (#523)
This commit is contained in:
+1
-9
@@ -45,12 +45,6 @@ COPY ./userspace/compile-modemmanager.sh /tmp/agnos/
|
||||
RUN --mount=type=cache,target=/root/.ccache,id=modemmanager,sharing=shared \
|
||||
/tmp/agnos/compile-modemmanager.sh
|
||||
|
||||
# lpac
|
||||
FROM agnos-compiler-libqmi AS agnos-compiler-lpac
|
||||
COPY ./userspace/compile-lpac.sh /tmp/agnos/
|
||||
RUN --mount=type=cache,target=/root/.ccache,id=lpac,sharing=shared \
|
||||
/tmp/agnos/compile-lpac.sh
|
||||
|
||||
# qtwayland5
|
||||
FROM agnos-compiler AS agnos-compiler-qtwayland5
|
||||
COPY ./userspace/qtwayland/*.deb /tmp/agnos/
|
||||
@@ -110,7 +104,6 @@ RUN mv /data/persist /system/ && rm -rf /data/*
|
||||
|
||||
COPY --from=agnos-compiler-libqmi /tmp/libqmi.deb /tmp/
|
||||
COPY --from=agnos-compiler-modemmanager /tmp/modemmanager.deb /tmp/
|
||||
COPY --from=agnos-compiler-lpac /tmp/lpac.deb /tmp/
|
||||
|
||||
RUN cd /tmp && \
|
||||
apt-get update && \
|
||||
@@ -129,8 +122,7 @@ RUN cd /tmp && \
|
||||
polkitd \
|
||||
mobile-broadband-provider-info && \
|
||||
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./libqmi.deb && \
|
||||
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./modemmanager.deb && \
|
||||
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./lpac.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
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
LPAC_VERSION="v2.2.1"
|
||||
|
||||
cd /tmp
|
||||
|
||||
git clone -b $LPAC_VERSION --depth 1 https://github.com/estkme-group/lpac.git
|
||||
|
||||
cd lpac
|
||||
|
||||
apt-get update && apt-get install -yq --no-install-recommends cmake
|
||||
|
||||
./scripts/setup-debian.sh
|
||||
|
||||
cmake \
|
||||
-DLPAC_WITH_APDU_QMI=ON \
|
||||
-DLPAC_WITH_APDU_PCSC=OFF \
|
||||
-DCPACK_GENERATOR=DEB .
|
||||
|
||||
make -j package
|
||||
|
||||
mv lpac*.deb /tmp/lpac.deb
|
||||
Reference in New Issue
Block a user