cleanup up old lib64 references (#30246)

* cleanup sensord

* rm rest

* fix that

* update that
old-commit-hash: f0aa631818
testing-closet
Adeeb Shihadeh 2 years ago committed by GitHub
parent 3196e129ca
commit c3aa58b492
  1. 1
      release/files_common
  2. 2
      selfdrive/test/test_onroad.py
  3. 1
      selfdrive/ui/soundd/soundd
  4. 1
      selfdrive/ui/spinner
  5. 1
      selfdrive/ui/text
  6. 1
      selfdrive/ui/ui
  7. 2
      system/sensord/.gitignore
  8. 2
      system/sensord/SConscript
  9. 4
      system/sensord/sensord
  10. 2
      system/sensord/tests/test_sensord.py

@ -285,7 +285,6 @@ system/sensord/SConscript
system/sensord/sensors_qcom2.cc system/sensord/sensors_qcom2.cc
system/sensord/sensors/*.cc system/sensord/sensors/*.cc
system/sensord/sensors/*.h system/sensord/sensors/*.h
system/sensord/sensord
system/sensord/pigeond.py system/sensord/pigeond.py
selfdrive/thermald/thermald.py selfdrive/thermald/thermald.py

@ -34,7 +34,7 @@ PROCS = {
"selfdrive.controls.plannerd": 16.5, "selfdrive.controls.plannerd": 16.5,
"./_ui": 18.0, "./_ui": 18.0,
"selfdrive.locationd.paramsd": 9.0, "selfdrive.locationd.paramsd": 9.0,
"./_sensord": 7.0, "./sensord": 7.0,
"selfdrive.controls.radard": 4.5, "selfdrive.controls.radard": 4.5,
"selfdrive.modeld.modeld": 8.0, "selfdrive.modeld.modeld": 8.0,
"selfdrive.modeld.dmonitoringmodeld": 8.0, "selfdrive.modeld.dmonitoringmodeld": 8.0,

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
cd "$(dirname "$0")" cd "$(dirname "$0")"
export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH"
export QT_QPA_PLATFORM="offscreen" export QT_QPA_PLATFORM="offscreen"
exec ./_soundd exec ./_soundd

@ -4,5 +4,4 @@ if [ -f /TICI ] && [ ! -f qt/spinner ]; then
cp qt/spinner_larch64 qt/spinner cp qt/spinner_larch64 qt/spinner
fi fi
export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH"
exec ./qt/spinner "$1" exec ./qt/spinner "$1"

@ -4,5 +4,4 @@ if [ -f /TICI ] && [ ! -f qt/text ]; then
cp qt/text_larch64 qt/text cp qt/text_larch64 qt/text
fi fi
export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH"
exec ./qt/text "$1" exec ./qt/text "$1"

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
cd "$(dirname "$0")" cd "$(dirname "$0")"
export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH"
export QT_DBL_CLICK_DIST=150 export QT_DBL_CLICK_DIST=150
exec ./_ui exec ./_ui

@ -1 +1 @@
_sensord sensord

@ -14,4 +14,4 @@ sensors = [
libs = [common, cereal, messaging, 'capnp', 'zmq', 'kj', 'pthread'] libs = [common, cereal, messaging, 'capnp', 'zmq', 'kj', 'pthread']
if arch == "larch64": if arch == "larch64":
libs.append('i2c') libs.append('i2c')
env.Program('_sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs) env.Program('sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs)

@ -1,4 +0,0 @@
#!/bin/sh
cd "$(dirname "$0")"
export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH"
exec ./_sensord

@ -108,7 +108,7 @@ class TestSensord(unittest.TestCase):
os.environ["LSM_SELF_TEST"] = "1" os.environ["LSM_SELF_TEST"] = "1"
# read initial sensor values every test case can use # read initial sensor values every test case can use
os.system("pkill -f ./_sensord") os.system("pkill -f ./sensord")
try: try:
managed_processes["sensord"].start() managed_processes["sensord"].start()
cls.sample_secs = int(os.getenv("SAMPLE_SECS", "10")) cls.sample_secs = int(os.getenv("SAMPLE_SECS", "10"))

Loading…
Cancel
Save