Merge branch 'master' of https://github.com/commaai/panda into vw-com…

…munity-devel

.pre-commit-config.yaml

@@ -15,6 +15,6 @@ repos:
       additional_dependencies: ['git+https://github.com/numpy/numpy-stubs', 'types-requests', 'types-atomicwrites',
                                 'types-pycurl']
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.7
+  rev: v0.1.8
   hooks:
     - id: ruff

SConscript

@@ -7,7 +7,7 @@ BUILDER = "DEV"
 
 common_flags = []
 
-panda_root = Dir('.').abspath
+panda_root = Dir('.')
 
 if os.getenv("RELEASE"):
   BUILD_TYPE = "RELEASE"
@@ -16,7 +16,7 @@ if os.getenv("RELEASE"):
   assert os.path.exists(cert_fn), 'Certificate file not found. Please specify absolute path'
 else:
   BUILD_TYPE = "DEBUG"
-  cert_fn = File("./certs/debug").srcnode().abspath
+  cert_fn = File("./certs/debug").srcnode().relpath
   common_flags += ["-DALLOW_DEBUG"]
 
   if os.getenv("DEBUG"):
@@ -35,7 +35,7 @@ def get_version(builder, build_type):
 def get_key_header(name):
   from Crypto.PublicKey import RSA
 
-  public_fn = File(f'./certs/{name}.pub').srcnode().abspath
+  public_fn = File(f'./certs/{name}.pub').srcnode().get_path()
   with open(public_fn) as f:
     rsa = RSA.importKey(f.read())
   assert(rsa.size_in_bits() == 1024)
@@ -63,7 +63,7 @@ def to_c_uint32(x):
 
 
 def build_project(project_name, project, extra_flags):
-  linkerscript_fn = File(project["LINKER_SCRIPT"]).srcnode().abspath
+  linkerscript_fn = File(project["LINKER_SCRIPT"]).srcnode().relpath
 
   flags = project["PROJECT_FLAGS"] + extra_flags + common_flags + [
     "-Wall",
@@ -123,7 +123,7 @@ def build_project(project_name, project, extra_flags):
   main_bin = env.Objcopy(f"obj/{project_name}.bin", main_elf)
 
   # Sign main
-  sign_py = File(f"{panda_root}/crypto/sign.py").srcnode().abspath
+  sign_py = File(f"{panda_root}/crypto/sign.py").srcnode().relpath
   env.Command(f"obj/{project_name}.bin.signed", main_bin, f"SETLEN=1 {sign_py} $SOURCE $TARGET {cert_fn}")