fix modeld launch script larch64 detection

old-commit-hash: 8cc5bfcef8
5 years ago · 18b33204cc
parent b1e01c8a5b
commit 18b33204cc
2 changed files with 17 additions and 7 deletions
--- a/selfdrive/modeld/dmonitoringmodeld
+++ b/selfdrive/modeld/dmonitoringmodeld
@ -1,11 +1,16 @@
 #!/bin/sh
+
 if [ -d /system ]; then
+    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
-
--- a/selfdrive/modeld/modeld
+++ b/selfdrive/modeld/modeld
@ -1,7 +1,12 @@
 #!/bin/sh
 if [ -d /system ]; then
+    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