From 7cf2b28b7883fdc3e68ad9e0974879103fa3a6ba Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Wed, 28 Feb 2024 14:41:42 -0500
Subject: [PATCH] scons: fix race condition with opendbc (#31621)

* fix race condition

* add to release

* fix for now

* bump
---
 SConstruct                                             | 8 +-------
 opendbc                                                | 2 +-
 release/files_common                                   | 2 ++
 selfdrive/SConscript                                   | 7 +++++++
 selfdrive/controls/lib/lateral_mpc_lib/SConscript      | 3 ++-
 selfdrive/controls/lib/longitudinal_mpc_lib/SConscript | 4 ++--
 6 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 selfdrive/SConscript

diff --git a/SConstruct b/SConstruct
index 4d4f9ad4fe..dac3529892 100644
--- a/SConstruct
+++ b/SConstruct
@@ -384,13 +384,7 @@ if arch != "Darwin":
 # Build openpilot
 SConscript(['third_party/SConscript'])
 
-SConscript(['selfdrive/boardd/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'])
+SConscript(['selfdrive/SConscript'])
 
 if arch in ['x86_64', 'aarch64', 'Darwin'] and Dir('#tools/cabana/').exists() and GetOption('extras'):
   SConscript(['tools/replay/SConscript'])
diff --git a/opendbc b/opendbc
index 0ac21652f2..5f096db742 160000
--- a/opendbc
+++ b/opendbc
@@ -1 +1 @@
-Subproject commit 0ac21652f2e643e29aa471ad6b238bf74b22e356
+Subproject commit 5f096db742b0c5dcd19976afdb07d5dd098f4b07
diff --git a/release/files_common b/release/files_common
index d62ef8d1bb..1fb05b43a7 100644
--- a/release/files_common
+++ b/release/files_common
@@ -60,6 +60,8 @@ system/logmessaged.py
 system/micd.py
 system/version.py
 
+selfdrive/SConscript
+
 selfdrive/athena/__init__.py
 selfdrive/athena/athenad.py
 selfdrive/athena/manage_athenad.py
diff --git a/selfdrive/SConscript b/selfdrive/SConscript
new file mode 100644
index 0000000000..6b72177d8e
--- /dev/null
+++ b/selfdrive/SConscript
@@ -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'])
\ No newline at end of file
diff --git a/selfdrive/controls/lib/lateral_mpc_lib/SConscript b/selfdrive/controls/lib/lateral_mpc_lib/SConscript
index 49666abe69..b6603e69fc 100644
--- a/selfdrive/controls/lib/lateral_mpc_lib/SConscript
+++ b/selfdrive/controls/lib/lateral_mpc_lib/SConscript
@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch')
+Import('env', 'envCython', 'arch', 'messaging_python', 'common_python', 'opendbc_python')
 
 gen = "c_generated_code"
 
@@ -60,6 +60,7 @@ lenv.Clean(generated_files, Dir(gen))
 generated_lat = lenv.Command(generated_files,
                              source_list,
                              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["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")
diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript b/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
index 79afa1d918..c00d5cb5a7 100644
--- a/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
+++ b/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
@@ -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"
 
@@ -66,7 +66,7 @@ lenv.Clean(generated_files, Dir(gen))
 generated_long = lenv.Command(generated_files,
                               source_list,
                               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["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")