From b249f40f0cb68d74351bafb439f28396be77476a Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 6 Jun 2022 13:27:45 -0700
Subject: [PATCH] move clocksd to system/ (#24761)

old-commit-hash: ca682b389d75f433d28063c8d774460df0c0fa83
---
 SConstruct                               | 7 ++++---
 release/files_common                     | 6 +++---
 selfdrive/manager/process_config.py      | 2 +-
 {selfdrive => system}/clocksd/.gitignore | 0
 {selfdrive => system}/clocksd/SConscript | 0
 {selfdrive => system}/clocksd/clocksd.cc | 0
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename {selfdrive => system}/clocksd/.gitignore (100%)
 rename {selfdrive => system}/clocksd/SConscript (100%)
 rename {selfdrive => system}/clocksd/clocksd.cc (100%)

diff --git a/SConstruct b/SConstruct
index e0e24d2664..0aeb382c23 100644
--- a/SConstruct
+++ b/SConstruct
@@ -378,8 +378,10 @@ Export('rednose_config')
 SConscript(['rednose/SConscript'])
 
 # Build system services
-
-SConscript(['system/proclogd/SConscript'])
+SConscript([
+  'system/clocksd/SConscript',
+  'system/proclogd/SConscript',
+])
 if arch != "Darwin":
   SConscript(['system/logcatd/SConscript'])
 
@@ -402,7 +404,6 @@ SConscript(['selfdrive/controls/lib/lateral_mpc_lib/SConscript'])
 SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript'])
 
 SConscript(['selfdrive/boardd/SConscript'])
-SConscript(['selfdrive/clocksd/SConscript'])
 
 SConscript(['selfdrive/loggerd/SConscript'])
 
diff --git a/release/files_common b/release/files_common
index 9c6a2cec47..ceb0110606 100644
--- a/release/files_common
+++ b/release/files_common
@@ -119,9 +119,9 @@ selfdrive/car/tesla/*.py
 selfdrive/car/toyota/*.py
 selfdrive/car/volkswagen/*.py
 
-selfdrive/clocksd/.gitignore
-selfdrive/clocksd/SConscript
-selfdrive/clocksd/clocksd.cc
+system/clocksd/.gitignore
+system/clocksd/SConscript
+system/clocksd/clocksd.cc
 
 selfdrive/debug/*.py
 
diff --git a/selfdrive/manager/process_config.py b/selfdrive/manager/process_config.py
index 4a71aa508b..5d996d1169 100644
--- a/selfdrive/manager/process_config.py
+++ b/selfdrive/manager/process_config.py
@@ -21,7 +21,7 @@ procs = [
   DaemonProcess("manage_athenad", "selfdrive.athena.manage_athenad", "AthenadPid"),
   # due to qualcomm kernel bugs SIGKILLing camerad sometimes causes page table corruption
   NativeProcess("camerad", "selfdrive/camerad", ["./camerad"], unkillable=True, callback=driverview),
-  NativeProcess("clocksd", "selfdrive/clocksd", ["./clocksd"]),
+  NativeProcess("clocksd", "system/clocksd", ["./clocksd"]),
   NativeProcess("dmonitoringmodeld", "selfdrive/modeld", ["./dmonitoringmodeld"], enabled=(not PC or WEBCAM), callback=driverview),
   NativeProcess("logcatd", "system/logcatd", ["./logcatd"]),
   NativeProcess("encoderd", "selfdrive/loggerd", ["./encoderd"]),
diff --git a/selfdrive/clocksd/.gitignore b/system/clocksd/.gitignore
similarity index 100%
rename from selfdrive/clocksd/.gitignore
rename to system/clocksd/.gitignore
diff --git a/selfdrive/clocksd/SConscript b/system/clocksd/SConscript
similarity index 100%
rename from selfdrive/clocksd/SConscript
rename to system/clocksd/SConscript
diff --git a/selfdrive/clocksd/clocksd.cc b/system/clocksd/clocksd.cc
similarity index 100%
rename from selfdrive/clocksd/clocksd.cc
rename to system/clocksd/clocksd.cc