Merge branch 'clearpilot' of https://git.hanson.xyz/brianhansonxyz/clearpilot into clearpilot

This commit is contained in:
2026-04-15 01:26:46 +00:00
4 changed files with 30 additions and 3 deletions

View File

@@ -121,6 +121,7 @@ def objcopy(source, target, env, for_signature):
return '$OBJCOPY -O binary %s %s' % (source[0], target[0]) return '$OBJCOPY -O binary %s %s' % (source[0], target[0])
# Common autogenerated includes # Common autogenerated includes
os.makedirs("obj", exist_ok=True)
git_ver = get_version(BUILDER, BUILD_TYPE) git_ver = get_version(BUILDER, BUILD_TYPE)
with open("obj/gitversion.h", "w") as f: with open("obj/gitversion.h", "w") as f:
f.write(f'const uint8_t gitversion[8] = "{git_ver}";\n') f.write(f'const uint8_t gitversion[8] = "{git_ver}";\n')

View File

@@ -166,6 +166,7 @@ Export('base_project_f4', 'base_project_h7', 'build_project')
# Common autogenerated includes # Common autogenerated includes
os.makedirs("board/obj", exist_ok=True)
with open("board/obj/gitversion.h", "w") as f: with open("board/obj/gitversion.h", "w") as f:
f.write(f'const uint8_t gitversion[] = "{get_version(BUILDER, BUILD_TYPE)}";\n') f.write(f'const uint8_t gitversion[] = "{get_version(BUILDER, BUILD_TYPE)}";\n')

View File

@@ -14,5 +14,5 @@ nmcli radio wifi on 2>/dev/null
# Provision (packages, git pull, build) if no quick_boot flag # Provision (packages, git pull, build) if no quick_boot flag
if [ ! -f /data/quick_boot ]; then if [ ! -f /data/quick_boot ]; then
/data/openpilot/system/clearpilot/tools/qt_shell "/data/openpilot/system/clearpilot/provision_wrapper.sh" --title="ClearPilot Provision" bash /data/openpilot/system/clearpilot/provision.sh
fi fi

View File

@@ -6,6 +6,8 @@
# SSH is handled by on_start.sh before this runs. # SSH is handled by on_start.sh before this runs.
# Output is displayed on screen via qt_shell. # Output is displayed on screen via qt_shell.
mount -o rw,remount /
# 1. Wait for internet connectivity # 1. Wait for internet connectivity
echo "Waiting for internet connectivity (up to 30s)..." echo "Waiting for internet connectivity (up to 30s)..."
ONLINE=0 ONLINE=0
@@ -29,9 +31,32 @@ echo "Remounting / read-write..."
sudo mount -o remount,rw / sudo mount -o remount,rw /
echo "Installing packages..." echo "Installing packages..."
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y openvpn sudo apt-get install -y openvpn curl ccrypt
echo "Installing Node.js 18..."
curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
sudo apt-get install -y nodejs
node -v
sudo apt-get install -y npm
mount -o rw,remount /
echo "Installing Claude Code..."
curl -fsSL https://claude.ai/install.sh | bash
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc
echo "Packages installed" echo "Packages installed"
# Decrypt and install SSH identity keys (for git auth)
dongle_id=$(cat /data/params/d/DongleId 2>/dev/null)
ssh_dir="/data/ssh/.ssh"
if [[ $dongle_id == 90bb71* ]] && [[ ! -f "$ssh_dir/id_rsa" || ! -f "$ssh_dir/id_rsa.pub" ]]; then
echo "Decrypting SSH identity keys..."
bash /data/openpilot/system/clearpilot/tools/decrypt /data/openpilot/system/clearpilot/dev/id_rsa.cpt /data/openpilot/system/clearpilot/dev/id_rsa
bash /data/openpilot/system/clearpilot/tools/decrypt /data/openpilot/system/clearpilot/dev/id_rsa.pub.cpt /data/openpilot/system/clearpilot/dev/id_rsa.pub
mkdir -p "$ssh_dir"
cp /data/openpilot/system/clearpilot/dev/id_rsa /data/openpilot/system/clearpilot/dev/id_rsa.pub "$ssh_dir"
chmod 700 "$ssh_dir"
chmod 600 "$ssh_dir/id_rsa" "$ssh_dir/id_rsa.pub"
echo "SSH identity keys installed to $ssh_dir"
fi
# 4. Pull latest from remote (remote always wins) # 4. Pull latest from remote (remote always wins)
echo "Checking for updates..." echo "Checking for updates..."
cd /data/openpilot cd /data/openpilot
@@ -50,7 +75,7 @@ fi
# 5. Build # 5. Build
echo "" echo ""
echo "Starting build..." echo "Starting build..."
su - comma -c "bash /data/openpilot/build_only.sh" sudo su - comma -c "bash /data/openpilot/build_only.sh"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Build succeeded" echo "Build succeeded"
touch /data/quick_boot touch /data/quick_boot