From 8cc5bfcef8bf91e55780ae2b9e7182e4099f8082 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Fri, 25 Sep 2020 14:14:54 +0200 Subject: [PATCH] fix modeld launch script larch64 detection --- selfdrive/modeld/dmonitoringmodeld | 15 ++++++++++----- selfdrive/modeld/modeld | 9 +++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/selfdrive/modeld/dmonitoringmodeld b/selfdrive/modeld/dmonitoringmodeld index cf6ba8c0..e68c1310 100755 --- a/selfdrive/modeld/dmonitoringmodeld +++ b/selfdrive/modeld/dmonitoringmodeld @@ -1,11 +1,16 @@ #!/bin/sh + if [ -d /system ]; then - export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH" - export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/" + if [ -f /TICI ]; then # QCOM2 + export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$LD_LIBRARY_PATH" + export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/larch64/" + else # QCOM + export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH" + export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/" + fi else - export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/larch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH" - export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/larch64/" + # PC + export LD_LIBRARY_PATH="$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:/openpilot/phonelibs/snpe/x86_64:$HOME/openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH" fi exec ./_dmonitoringmodeld - diff --git a/selfdrive/modeld/modeld b/selfdrive/modeld/modeld index 3aafb882..66868595 100755 --- a/selfdrive/modeld/modeld +++ b/selfdrive/modeld/modeld @@ -1,7 +1,12 @@ #!/bin/sh if [ -d /system ]; then - export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH" + if [ -f /TICI ]; then # QCOM2 + export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$LD_LIBRARY_PATH" + else # QCOM + export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH" + fi else - export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:/openpilot/phonelibs/snpe/x86_64:$HOME/openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH" + # PC + export LD_LIBRARY_PATH="$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:/openpilot/phonelibs/snpe/x86_64:$HOME/openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH" fi exec ./_modeld