Merge branch 'commaai:master' into master

Author: spektor56

README.md

@@ -34,8 +34,12 @@ Flashing to a comma 3/3X (Be sure to set your device in QDL mode before flashing
 ```
 ./flash_kernel.sh
 ./flash_system.sh
+
+./flash_all.sh 
 ```
 
+In the event that flashing from building doesn't work, `scripts/download-from-manifest.py` allows you to download the latest AGNOS version for flashing.
+
 > [!NOTE]
 > If flashing on M-series Macs, you may need to run `brew install libusb` and then `sudo mkdir -p /usr/local/lib && sudo ln -s /opt/homebrew/lib/libusb-1.0.0.dylib /usr/local/lib/libusb.dylib` if getting "No backend available".
 

VERSION

@@ -1 +1 @@
-11.7
+11.12

agnos-kernel-sdm845

@@ -86,7 +86,7 @@ build_kernel() {
   $TOOLS/mkbootimg \
     --kernel Image.gz-dtb \
     --ramdisk /dev/null \
-    --cmdline "console=ttyMSM0,115200n8 quiet loglevel=3 earlycon=msm_geni_serial,0xA84000 androidboot.hardware=qcom androidboot.console=ttyMSM0 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 androidboot.selinux=permissive firmware_class.path=/lib/firmware/updates net.ifnames=0 dyndbg=\"\"" \
+    --cmdline "console=ttyMSM0,115200n8 isolcpus=6,7 quiet loglevel=3 earlycon=msm_geni_serial,0xA84000 androidboot.hardware=qcom androidboot.console=ttyMSM0 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 androidboot.selinux=permissive firmware_class.path=/lib/firmware/updates net.ifnames=0 dyndbg=\"\"" \
     --pagesize 4096 \
     --base 0x80000000 \
     --kernel_offset 0x8000 \

build_kernel.sh

@@ -2,8 +2,8 @@
 set -e
 
 UBUNTU_BASE_URL="https://cdimage.ubuntu.com/ubuntu-base/releases/24.04/release/"
-UBUNTU_FILE="ubuntu-base-24.04.1-base-arm64.tar.gz"
-UBUNTU_FILE_CHECKSUM="7700539236d24c31c3eea1d5345eba5ee0353a1bac7d91ea5720b399b27f3cb4"
+UBUNTU_FILE="ubuntu-base-24.04.2-base-arm64.tar.gz"
+UBUNTU_FILE_CHECKSUM="d3144c017e40b328c0e86f022d8d00a786db036784103c4413aa533dd97cbd3d"
 
 # Make sure we're in the correct spot
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"

build_system.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# This script applies a patch from a Github URL (commit/PR) to the current path.
+# Usage: ./apply_github_patch.sh <github_url>
+
+URL=$1
+if [ -z "$URL" ]; then
+  echo "Usage: $0 <github_url>"
+  exit 1
+fi
+
+# Download the diff file from the URL
+DIFF_FILE=$(mktemp)
+curl -sL "$URL.diff" > "$DIFF_FILE"
+if [ $? -ne 0 ]; then
+  echo "Failed to download diff from $URL"
+  exit 1
+fi
+
+# Apply the patch
+git apply "$DIFF_FILE"
+if [ $? -ne 0 ]; then
+  echo "Failed to apply patch from $URL"
+  rm "$DIFF_FILE"
+  exit 1
+fi
+
+echo "Successfully applied patch from $URL"
+rm "$DIFF_FILE"

scripts/apply_github_patch.sh

@@ -23,10 +23,7 @@ if [ "$(< .git/HEAD)" != "$VERSION" ]; then
   git fetch origin $VERSION
   git checkout $VERSION
   git submodule update --depth=1 --init --recursive
-
-  # TODO: remove "--no-binary capstone" when capstone v5.0.2 is released
-  # https://github.com/capstone-engine/capstone/issues/2301#issuecomment-2026835275
-  pip3 install -r requirements.txt --no-binary capstone
+  pip3 install -r requirements.txt
 fi
 popd > /dev/null
 

tools/edl

@@ -40,13 +40,24 @@ git apply /tmp/agnos/patch-qtwayland-v5.12
 # https://stackoverflow.com/a/75855054/639708
 ln -s libdl.so.2 /usr/lib/aarch64-linux-gnu/libdl.so
 
-mkdir /tmp/build && cd /tmp/build
-qmake /tmp/qtwayland
-
+qmake
 export MAKEFLAGS="-j$(nproc)"
 make
 
-# 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 --pkgversion="${VERSION}" --pkgname=qtwayland5 --pkgarch=arm64 --replaces=qtwayland5,libqt5waylandclient5,libqt5waylandcompositor5
-mv qtwayland5*.deb /tmp/qtwayland5.deb
+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/compile-qtwayland5.sh

@@ -4,6 +4,7 @@
 
 apt-fast update && apt-fast install -y --no-install-recommends \
   bash-completion \
+  btop \
   iperf \
   dnsmasq \
   irqtop \

userspace/install_extras.sh

@@ -73,6 +73,7 @@ mkdir -p /data/tmp
 mkdir -p /data/tmp/vscode-server
 ln -s /data/tmp/vscode-server ~/.vscode-server
 ln -s /data/tmp/vscode-server ~/.cursor-server
+ln -s /data/tmp/vscode-server ~/.windsurf-server
 
 while true; do
   pkill -f "$SETUP"