Skip to content

Commit

Permalink
package_ota: remove converting sparse to raw (#289)
Browse files Browse the repository at this point in the history
* package_ota: don't convert sparse image to raw if raw images already exists

* don't convert anymore
  • Loading branch information
andiradulescu authored Aug 7, 2024
1 parent b040fcd commit 2c6b35d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ jobs:
env:
AGNOS_UPDATE_URL: https://raw.githubusercontent.com/commaai/ci-artifacts/agnos-builder/pr-${{ github.event.number }}/
run: |
sudo apt-get install -y android-sdk-libsparse-utils
scripts/package_ota.py
- name: Copy and push boot, system and agnos.json
Expand Down
13 changes: 6 additions & 7 deletions scripts/package_ota.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import subprocess
from copy import deepcopy
from pathlib import Path
from tempfile import NamedTemporaryFile

ROOT = Path(__file__).parent.parent
OUTPUT_DIR = ROOT / "output"
Expand All @@ -32,12 +31,12 @@ def process_file(fn, name, sparse=False, full_check=True, has_ab=True, alt=None)
print(f" {size} bytes, hash {hash}")

if sparse:
with NamedTemporaryFile() as tmp_f:
print(" converting sparse image to raw")
subprocess.check_call(["simg2img", fn, tmp_f.name])
hash_raw = checksum(tmp_f.name)
size = Path(tmp_f.name).stat().st_size
print(f" {size} bytes, hash {hash} (raw)")
raw_img = OUTPUT_DIR / "system.raw.img"
if raw_img.exists():
print(" using existing raw image")
hash_raw = checksum(raw_img)
size = raw_img.stat().st_size
print(f" {size} bytes, hash {hash_raw} (raw)")

print(" compressing")
xz_fn = OTA_OUTPUT_DIR / f"{fn.stem}-{hash_raw}.img.xz"
Expand Down

0 comments on commit 2c6b35d

Please sign in to comment.