scons: fix race condition with opendbc (#31621)

* fix race condition

* add to release

* fix for now

* bump
pull/31631/head
Justin Newberry 1 year ago committed by GitHub
parent 2c247ea2c6
commit 7cf2b28b78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      SConstruct
  2. 2
      opendbc
  3. 2
      release/files_common
  4. 7
      selfdrive/SConscript
  5. 3
      selfdrive/controls/lib/lateral_mpc_lib/SConscript
  6. 4
      selfdrive/controls/lib/longitudinal_mpc_lib/SConscript

@ -384,13 +384,7 @@ if arch != "Darwin":
# Build openpilot # Build openpilot
SConscript(['third_party/SConscript']) SConscript(['third_party/SConscript'])
SConscript(['selfdrive/boardd/SConscript']) SConscript(['selfdrive/SConscript'])
SConscript(['selfdrive/controls/lib/lateral_mpc_lib/SConscript'])
SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript'])
SConscript(['selfdrive/locationd/SConscript'])
SConscript(['selfdrive/navd/SConscript'])
SConscript(['selfdrive/modeld/SConscript'])
SConscript(['selfdrive/ui/SConscript'])
if arch in ['x86_64', 'aarch64', 'Darwin'] and Dir('#tools/cabana/').exists() and GetOption('extras'): if arch in ['x86_64', 'aarch64', 'Darwin'] and Dir('#tools/cabana/').exists() and GetOption('extras'):
SConscript(['tools/replay/SConscript']) SConscript(['tools/replay/SConscript'])

@ -1 +1 @@
Subproject commit 0ac21652f2e643e29aa471ad6b238bf74b22e356 Subproject commit 5f096db742b0c5dcd19976afdb07d5dd098f4b07

@ -60,6 +60,8 @@ system/logmessaged.py
system/micd.py system/micd.py
system/version.py system/version.py
selfdrive/SConscript
selfdrive/athena/__init__.py selfdrive/athena/__init__.py
selfdrive/athena/athenad.py selfdrive/athena/athenad.py
selfdrive/athena/manage_athenad.py selfdrive/athena/manage_athenad.py

@ -0,0 +1,7 @@
SConscript(['boardd/SConscript'])
SConscript(['controls/lib/lateral_mpc_lib/SConscript'])
SConscript(['controls/lib/longitudinal_mpc_lib/SConscript'])
SConscript(['locationd/SConscript'])
SConscript(['navd/SConscript'])
SConscript(['modeld/SConscript'])
SConscript(['ui/SConscript'])

@ -1,4 +1,4 @@
Import('env', 'envCython', 'arch') Import('env', 'envCython', 'arch', 'messaging_python', 'common_python', 'opendbc_python')
gen = "c_generated_code" gen = "c_generated_code"
@ -60,6 +60,7 @@ lenv.Clean(generated_files, Dir(gen))
generated_lat = lenv.Command(generated_files, generated_lat = lenv.Command(generated_files,
source_list, source_list,
f"cd {Dir('.').abspath} && python3 lat_mpc.py") f"cd {Dir('.').abspath} && python3 lat_mpc.py")
lenv.Depends(generated_lat, [messaging_python, common_python, opendbc_python])
lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")

@ -1,4 +1,4 @@
Import('env', 'envCython', 'arch', 'messaging_python', 'common_python') Import('env', 'envCython', 'arch', 'messaging_python', 'common_python', 'opendbc_python')
gen = "c_generated_code" gen = "c_generated_code"
@ -66,7 +66,7 @@ lenv.Clean(generated_files, Dir(gen))
generated_long = lenv.Command(generated_files, generated_long = lenv.Command(generated_files,
source_list, source_list,
f"cd {Dir('.').abspath} && python3 long_mpc.py") f"cd {Dir('.').abspath} && python3 long_mpc.py")
lenv.Depends(generated_long, [messaging_python, common_python]) lenv.Depends(generated_long, [messaging_python, common_python, opendbc_python])
lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")

Loading…
Cancel
Save