fixups

geohot · geohot · commit 79b2fbf70d0f · 2019-11-01T09:34:23.000-07:00
diff --git a/messaging/.gitignore b/messaging/.gitignore
@@ -1 +1,5 @@
 demo
+*.o
+*.d
+*.a
+*.so
diff --git a/messaging/__init__.py b/messaging/__init__.py
@@ -7,7 +7,7 @@
 
 from cereal import log
 from common.realtime import sec_since_boot
-from selfdrive.services import service_list
+from cereal.services import service_list
 
 
 context = Context()
diff --git a/messaging/messaging_pyx_setup.py b/messaging/messaging_pyx_setup.py
@@ -26,7 +26,7 @@
           extra_compile_args=extra_compile_args,
           libraries=libraries,
           extra_objects=[
-            os.path.join(BASEDIR, 'selfdrive', 'messaging', 'messaging.a'),
+            os.path.join(BASEDIR, 'cereal', 'messaging', 'messaging.a'),
           ]
         )
       ),

-Original file line number
+Diff line change
 demo
 +*.o
 +*.d
 +*.a
 +*.so
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`extra_compile_args=extra_compile_args,`
`27`	`27`	`libraries=libraries,`
`28`	`28`	`extra_objects=[`
`29`		`- os.path.join(BASEDIR, 'selfdrive', 'messaging', 'messaging.a'),`
	`29`	`+ os.path.join(BASEDIR, 'cereal', 'messaging', 'messaging.a'),`
`30`	`30`	`]`
`31`	`31`	`)`
`32`	`32`	`),`