Revert "Remove Qt + weston (#502)"

This reverts commit 3762ea1.

Author: maxime-desroches

Dockerfile.agnos

@@ -51,6 +51,14 @@ 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/
+COPY ./userspace/compile-qtwayland5.sh /tmp/agnos/
+COPY ./userspace/qtwayland/patch* /tmp/agnos/
+RUN --mount=type=cache,target=/root/.ccache,id=qtwayland5,sharing=shared \
+    /tmp/agnos/compile-qtwayland5.sh
+
 # ################## #
 # ###### Base ###### #
 # ################## #
@@ -79,6 +87,15 @@ RUN /tmp/agnos/openpilot_dependencies.sh
 COPY ./userspace/openpilot_python_dependencies.sh /tmp/agnos/
 RUN /tmp/agnos/openpilot_python_dependencies.sh
 
+# Install old Qt 5.12.8, libwayland 1.9.0-1 and deps
+COPY ./userspace/qtwayland/*.deb /tmp/agnos/
+RUN 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
+
 # ################### #
 # ###### AGNOS ###### #
 # ################### #
@@ -136,6 +153,12 @@ RUN source $XDG_DATA_HOME/venv/bin/activate && \
 COPY ./userspace/install_extras.sh /tmp/agnos/
 RUN /tmp/agnos/install_extras.sh
 
+COPY --from=agnos-compiler-qtwayland5 /tmp/qtwayland5.deb /tmp/qtwayland5.deb
+RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq --allow-downgrades ./qtwayland5.deb
+
+# Patched libeglSubDriverWayland with fixed nullptr deref in CommitBuffer
+COPY ./userspace/files/libeglSubDriverWayland.so.patched /lib/aarch64-linux-gnu/libeglSubDriverWayland.so
+
 COPY ./userspace/home/ /home/$USERNAME/
 COPY ./userspace/home/.config/ /root/.config
 RUN chown -R $USERNAME: /home/$USERNAME/.config
@@ -171,6 +194,10 @@ COPY ./userspace/libs32/* /usr/lib/arm-linux-gnueabihf/
 #COPY ./userspace/files/linux-headers-4.9.103+_4.9.103+-1_arm64.deb /tmp/
 #RUN dpkg -i /tmp/linux-headers-4.9.103+_4.9.103+-1_arm64.deb
 
+# Weston with hacked touch rotate and color correction
+COPY ./userspace/files/weston /usr/bin/weston
+COPY ./userspace/files/gl-renderer.so /usr/lib/arm-linux-gnueabihf/weston
+
 # Setup systemd services
 COPY ./userspace/services.sh /tmp/agnos
 RUN /tmp/agnos/services.sh
@@ -199,6 +226,9 @@ COPY ./userspace/files/avahi-override.conf /etc/systemd/system/avahi-daemon.serv
 # Prevent polkitd memory leak from getting out of hand by restarting it every ~day
 COPY ./userspace/files/polkit-override.conf /etc/systemd/system/polkit.service.d/override.conf
 
+# Remove qt network bearer plugins
+RUN rm -rf /usr/lib/aarch64-linux-gnu/qt5/plugins/bearer
+
 # Add iptable rules to block incoming traffic on wwan0
 COPY ./userspace/etc/iptables/rules.v4 /etc/iptables/rules.v4
 

README.md

@@ -87,4 +87,4 @@ Some concrete things on the roadmap:
 - [ ] mainline Linux kernel https://github.com/commaai/openpilot/issues/32386
 - [ ] fully open source
   - [ ] anything from `firmware/`: XBL, ABL, etc.
-  - [x] <s>Weston https://github.com/commaai/agnos-builder/issues/16</s> deleted!
+  - [ ] Weston https://github.com/commaai/agnos-builder/issues/16

userspace/.gitattributes

@@ -1,5 +1,7 @@
 usr/comma/wlan.ko filter=lfs diff=lfs merge=lfs -text
 usr/comma/wifi filter=lfs diff=lfs merge=lfs -text
+files/weston filter=lfs diff=lfs merge=lfs -text
+files/libeglSubDriverWayland.so.patched filter=lfs diff=lfs merge=lfs -text
 usr/comma/reset filter=lfs diff=lfs merge=lfs -text
 usr/comma/setup filter=lfs diff=lfs merge=lfs -text
 usr/comma/installer filter=lfs diff=lfs merge=lfs -text

userspace/compile-qtwayland5.sh

@@ -0,0 +1,63 @@
+#!/bin/bash -e
+
+VERSION=5.12.9
+
+# Install build requirements
+dpkg --add-architecture armhf
+
+apt-get update && apt-get install -yq --no-install-recommends \
+    libc6:armhf \
+    libdbus-1-3 \
+    libegl-dev \
+    libexpat1:armhf \
+    libfontconfig-dev \
+    libfreetype6 \
+    libgles-dev \
+    libglib2.0-dev \
+    libharfbuzz-dev \
+    libpcre2-dev \
+    libwayland-dev \
+    libxcomposite-dev \
+    libxkbcommon-dev \
+    zlib1g-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
+
+# Patched qtwayland that outputs a fixed screen size
+# Clone qtwayland submodule, checkout, apply patch, qmake, make
+cd /tmp
+git clone --branch v${VERSION} --depth 1 https://github.com/qt/qtwayland.git
+cd qtwayland
+
+git apply /tmp/agnos/patch-qtwayland-v5.12
+
+# qtwayland is incorrectly built against libdl.so instead of libdl.so.2
+# https://stackoverflow.com/a/75855054/639708
+ln -s libdl.so.2 /usr/lib/aarch64-linux-gnu/libdl.so
+
+qmake
+export MAKEFLAGS="-j$(nproc)"
+make
+
+OUTPUT_DIR=/tmp/qtwayland5
+mkdir $OUTPUT_DIR
+make install INSTALL_ROOT=$OUTPUT_DIR
+
+mkdir $OUTPUT_DIR/DEBIAN
+cat << EOF > $OUTPUT_DIR/DEBIAN/control
+Package: qtwayland5
+Version: ${VERSION}-1
+Architecture: all
+Maintainer: Andrei Radulescu <andi.radulescu@gmail.com>
+Replaces: qtwayland5, libqt5waylandclient5, libqt5waylandcompositor5
+Installed-Size: `du -s $OUTPUT_DIR | awk '{print $1}'`
+Homepage: https://comma.ai
+Description: Patched qtwayland that outputs a fixed screen size
+EOF
+
+dpkg-deb --root-owner-group --build $OUTPUT_DIR /tmp/qtwayland5.deb

userspace/files/agnos-tests.service

@@ -1,5 +1,5 @@
 [Unit]
-#After=
+#After=weston-ready.service
 
 [Service]
 #Type=simple
@@ -10,6 +10,7 @@ Restart=no
 # exit if connected to 5V
 ExecStartPre=/bin/bash -c "if [ $(cat /sys/class/hwmon/hwmon1/in1_input) -le 6500 ]; then echo 'Exiting, connected to 5V'; exit 1; fi"
 
+#ExecStart=/bin/bash -c "source /etc/profile && /usr/comma/tests/test_weston.py"
 ExecStart=/bin/bash -c "source /etc/profile && /usr/comma/tests/test_sounds.py"
 
 [Install]

userspace/files/gl-renderer.so

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34b01105549bba97710ded5916a24a318d4b7dbe91fe4e617ca320a7d98f6a39
+size 197632

userspace/files/libeglSubDriverWayland.so.patched

@@ -26,7 +26,9 @@ if [ -d /etc/profile.d ]; then
   unset i
 fi
 
-export XDG_RUNTIME_DIR="/var/tmp/xdg"
+# display setup
+export XDG_RUNTIME_DIR="/var/tmp/weston"
+export QT_QPA_PLATFORM="wayland-egl"
 
 # python setup
 export PYTHONPATH="/data/pythonpath"

userspace/files/profile

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e38b2701eaa61471dfb2418b606846c0512afd90f67bfc0d65dcf5178fb51b8
+size 782832

userspace/files/weston

@@ -0,0 +1,28 @@
+[Unit]
+PartOf=weston.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Restart=no
+Environment="XDG_RUNTIME_DIR=/var/tmp/weston"
+
+ExecStart=/bin/echo "waiting for wayland socket"
+ExecStart=/bin/bash -c "while [ ! -e \"$XDG_RUNTIME_DIR/wayland-0\" ]; do sleep 0.1; done"
+
+# still starting after socket comes up
+ExecStart=/bin/sleep 0.5
+
+ExecStart=/bin/echo "fixing permissions"
+ExecStart=/bin/bash -c "chown -R comma: $XDG_RUNTIME_DIR"
+ExecStart=/bin/bash -c "chmod -R 700 $XDG_RUNTIME_DIR"
+
+# these are set by udev rules, but udev is slow
+ExecStart=/bin/bash -c "chgrp gpu /dev/ion /dev/kgsl-3d0"
+ExecStart=/bin/bash -c "chmod 660 /dev/ion /dev/kgsl-3d0"
+
+ExecStart=/bin/echo "turning on display"
+ExecStart=/bin/bash -c "echo 500 > /sys/class/backlight/panel0-backlight/brightness"
+
+[Install]
+WantedBy=multi-user.target