diff --git a/release/files_common b/release/files_common index 7fa7ad50d2..c573ea4508 100644 --- a/release/files_common +++ b/release/files_common @@ -285,7 +285,6 @@ system/sensord/SConscript system/sensord/sensors_qcom2.cc system/sensord/sensors/*.cc system/sensord/sensors/*.h -system/sensord/sensord system/sensord/pigeond.py selfdrive/thermald/thermald.py diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py index 894ab15c12..230a96ddad 100755 --- a/selfdrive/test/test_onroad.py +++ b/selfdrive/test/test_onroad.py @@ -34,7 +34,7 @@ PROCS = { "selfdrive.controls.plannerd": 16.5, "./_ui": 18.0, "selfdrive.locationd.paramsd": 9.0, - "./_sensord": 7.0, + "./sensord": 7.0, "selfdrive.controls.radard": 4.5, "selfdrive.modeld.modeld": 8.0, "selfdrive.modeld.dmonitoringmodeld": 8.0, diff --git a/selfdrive/ui/soundd/soundd b/selfdrive/ui/soundd/soundd index 66dda46d5b..9b7a32fec9 100755 --- a/selfdrive/ui/soundd/soundd +++ b/selfdrive/ui/soundd/soundd @@ -1,5 +1,4 @@ #!/bin/sh cd "$(dirname "$0")" -export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" export QT_QPA_PLATFORM="offscreen" exec ./_soundd diff --git a/selfdrive/ui/spinner b/selfdrive/ui/spinner index 6c8e533cc8..35feab3f7e 100755 --- a/selfdrive/ui/spinner +++ b/selfdrive/ui/spinner @@ -4,5 +4,4 @@ if [ -f /TICI ] && [ ! -f qt/spinner ]; then cp qt/spinner_larch64 qt/spinner fi -export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" exec ./qt/spinner "$1" diff --git a/selfdrive/ui/text b/selfdrive/ui/text index 2577e3006b..b44bec42bd 100755 --- a/selfdrive/ui/text +++ b/selfdrive/ui/text @@ -4,5 +4,4 @@ if [ -f /TICI ] && [ ! -f qt/text ]; then cp qt/text_larch64 qt/text fi -export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" exec ./qt/text "$1" diff --git a/selfdrive/ui/ui b/selfdrive/ui/ui index c9f81c0539..acb2a705a8 100755 --- a/selfdrive/ui/ui +++ b/selfdrive/ui/ui @@ -1,5 +1,4 @@ #!/bin/sh cd "$(dirname "$0")" -export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" export QT_DBL_CLICK_DIST=150 exec ./_ui diff --git a/system/sensord/.gitignore b/system/sensord/.gitignore index e9b8071b4b..e17675e254 100644 --- a/system/sensord/.gitignore +++ b/system/sensord/.gitignore @@ -1 +1 @@ -_sensord +sensord diff --git a/system/sensord/SConscript b/system/sensord/SConscript index 63d1d0d690..7974eb07ae 100644 --- a/system/sensord/SConscript +++ b/system/sensord/SConscript @@ -14,4 +14,4 @@ sensors = [ libs = [common, cereal, messaging, 'capnp', 'zmq', 'kj', 'pthread'] if arch == "larch64": libs.append('i2c') -env.Program('_sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs) +env.Program('sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs) diff --git a/system/sensord/sensord b/system/sensord/sensord deleted file mode 100755 index 9ea848d577..0000000000 --- a/system/sensord/sensord +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" -export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" -exec ./_sensord diff --git a/system/sensord/tests/test_sensord.py b/system/sensord/tests/test_sensord.py index d9743a14ea..fba3ef79a4 100755 --- a/system/sensord/tests/test_sensord.py +++ b/system/sensord/tests/test_sensord.py @@ -108,7 +108,7 @@ class TestSensord(unittest.TestCase): os.environ["LSM_SELF_TEST"] = "1" # read initial sensor values every test case can use - os.system("pkill -f ./_sensord") + os.system("pkill -f ./sensord") try: managed_processes["sensord"].start() cls.sample_secs = int(os.getenv("SAMPLE_SECS", "10"))