macOS: disable camerad and sensord build (#28164)

* Disable camerad and sensord on Darwin

* Add gcc@12 to mac_setup as it's required by panda

* Update panda
pull/28179/head
Kacper Rączy 2 years ago committed by GitHub
parent e08952acc8
commit 1a5f29ecc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      SConstruct
  2. 2
      panda
  3. 1
      tools/mac_setup.sh

@ -405,13 +405,17 @@ SConscript(['rednose/SConscript'])
# Build system services # Build system services
SConscript([ SConscript([
'system/camerad/SConscript',
'system/clocksd/SConscript', 'system/clocksd/SConscript',
'system/proclogd/SConscript', 'system/proclogd/SConscript',
'system/ubloxd/SConscript', 'system/ubloxd/SConscript',
'system/loggerd/SConscript',
]) ])
if arch != "Darwin": if arch != "Darwin":
SConscript(['system/logcatd/SConscript']) SConscript([
'system/camerad/SConscript',
'system/sensord/SConscript',
'system/logcatd/SConscript',
])
# Build openpilot # Build openpilot
@ -428,19 +432,13 @@ SConscript(['third_party/SConscript'])
SConscript(['common/kalman/SConscript']) SConscript(['common/kalman/SConscript'])
SConscript(['common/transformations/SConscript']) SConscript(['common/transformations/SConscript'])
SConscript(['selfdrive/modeld/SConscript']) SConscript(['selfdrive/boardd/SConscript'])
SConscript(['selfdrive/controls/lib/lateral_mpc_lib/SConscript']) SConscript(['selfdrive/controls/lib/lateral_mpc_lib/SConscript'])
SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript']) SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript'])
SConscript(['selfdrive/boardd/SConscript'])
SConscript(['system/loggerd/SConscript'])
SConscript(['selfdrive/locationd/SConscript']) SConscript(['selfdrive/locationd/SConscript'])
SConscript(['system/sensord/SConscript'])
SConscript(['selfdrive/ui/SConscript'])
SConscript(['selfdrive/navd/SConscript']) SConscript(['selfdrive/navd/SConscript'])
SConscript(['selfdrive/modeld/SConscript'])
SConscript(['selfdrive/ui/SConscript'])
if (arch in ['x86_64', 'Darwin'] and Dir('#tools/cabana/').exists()) or GetOption('extras'): if (arch in ['x86_64', 'Darwin'] and Dir('#tools/cabana/').exists()) or GetOption('extras'):
SConscript(['tools/replay/SConscript']) SConscript(['tools/replay/SConscript'])

@ -1 +1 @@
Subproject commit da7c57748648e786c99621271b5a88d11bcd90fa Subproject commit 822a7367c1912d8b19263bfbda15bf29b188d67d

@ -52,6 +52,7 @@ brew "zeromq"
brew "protobuf" brew "protobuf"
brew "protobuf-c" brew "protobuf-c"
brew "swig" brew "swig"
brew "gcc@12"
cask "gcc-arm-embedded" cask "gcc-arm-embedded"
EOS EOS

Loading…
Cancel
Save