diff --git a/release/README.md b/release/README.md index 77cd15ad69..203c2f7e70 100644 --- a/release/README.md +++ b/release/README.md @@ -3,7 +3,7 @@ ## terms -- `channel` - a named version of openpilot (git branch, casync caidx) which receives updates +- `channel` - a named version of openpilot (git branch, casync caibx) which receives updates - `build` - a release which is already built for the comma 3/3x and contains only required files for running openpilot and identifying the release - `build_style` - type of build, either `debug` or `release` @@ -28,7 +28,7 @@ ```bash # run on a tici, within the directory you want to create the build from. -# creates a prebuilt version of openpilot into BUILD_DIR and outputs the caidx +# creates a prebuilt version of openpilot into BUILD_DIR and outputs the caibx # and other casync files into CASYNC_DIR for uploading to openpilot-releases. BUILD_DIR=/data/openpilot_build \ CASYNC_DIR=/data/casync \ diff --git a/release/create_casync_release.py b/release/create_casync_release.py index 9aa75eca5d..6cc434b6e0 100755 --- a/release/create_casync_release.py +++ b/release/create_casync_release.py @@ -24,6 +24,6 @@ if __name__ == "__main__": create_build_metadata_file(target_dir, build_metadata, args.channel) create_caexclude_file(target_dir) - digest, caidx = create_casync_release(target_dir, output_dir, build_metadata.canonical) + digest, caibx = create_casync_release(target_dir, output_dir, build_metadata.canonical) - print(f"Created casync release from {target_dir} to {caidx} with digest {digest}") + print(f"Created casync release from {target_dir} to {caibx} with digest {digest}") diff --git a/system/hardware/tici/agnos.py b/system/hardware/tici/agnos.py index 502295be07..8f09b30850 100755 --- a/system/hardware/tici/agnos.py +++ b/system/hardware/tici/agnos.py @@ -10,7 +10,7 @@ from collections.abc import Generator import requests -import openpilot.system.hardware.tici.casync as casync +import openpilot.system.updated.casync.casync as casync SPARSE_CHUNK_FMT = struct.Struct('H2xI4x') CAIBX_URL = "https://commadist.azureedge.net/agnosupdate/" diff --git a/system/updated/casync/common.py b/system/updated/casync/common.py index 0e01f5c12e..8a09c46b8c 100644 --- a/system/updated/casync/common.py +++ b/system/updated/casync/common.py @@ -49,8 +49,8 @@ def create_build_metadata_file(path: pathlib.Path, build_metadata: BuildMetadata def create_casync_release(target_dir: pathlib.Path, output_dir: pathlib.Path, caibx_name: str): tar_file = output_dir / f"{caibx_name}.tar" run(["tar", "-cf", str(tar_file), target_dir]) - caidx_file = output_dir / f"{caibx_name}.caibx" - run(["casync", "make", *CASYNC_ARGS, caidx_file, str(tar_file)]) + caibx_file = output_dir / f"{caibx_name}.caibx" + run(["casync", "make", *CASYNC_ARGS, caibx_file, str(tar_file)]) tar_file.unlink() digest = run(["casync", "digest", *CASYNC_ARGS, target_dir]).decode("utf-8").strip() - return digest, caidx_file + return digest, caibx_file