From b596439e2770de9d241d23ba868f4ad772b066f1 Mon Sep 17 00:00:00 2001 From: DarekM <149845949+aninmucek@users.noreply.github.com> Date: Mon, 2 Nov 2026 00:45:22 +0000 Subject: [PATCH] device/akita: stage 0 notes and descriptor for the Pixel 8a Stage 0 for the Pixel 8a (akita, zuma), from a retail phone with root and the stock CP3A.261005.005 factory image, checked against Google's GPL akita and zuma device trees at android-16.0.0_r0.10. Both slots carry CP3A.261005.005 with bootloader akita-17.0-15681527, and two checksummed backups of every partition but userdata and super are kept off the repository. The descriptor is husky's with akita's board values: the IPOP base DTB entries (this phone boots B0/B1 IPOP, husky FOPLP), dtbo entry 18 (board id 0x40406, rev 0x10000) and the 1080x2400 panel. It writes no display register: DECON0's TRIG_CON at handover is still to be read on an 8a. Images wait for the board DTS, zuma-akita.dts, not written yet. tests/storage-guard and tests/usb-product now cover the descriptor. Co-Authored-By: Claude Opus 5.5 --- device/akita/NOTES.md | 93 +++++++++++++++++++++++++++++++ device/akita/akita-m1-overlay.dts | 24 ++++++++ device/akita/device.conf | 22 ++++++++ docs/DEVICES.md | 2 +- tests/storage-guard | 4 +- tests/usb-product | 4 +- 6 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 device/akita/NOTES.md create mode 100644 device/akita/akita-m1-overlay.dts create mode 100644 device/akita/device.conf diff --git a/device/akita/NOTES.md b/device/akita/NOTES.md new file mode 100644 index 000000000..63ae11a9f --- /dev/null +++ b/device/akita/NOTES.md @@ -0,0 +1,93 @@ + +# Pixel 8a (akita) bring-up notes + +Findings for the Pixel 8a port, newest first. akita shares the zuma SoC (Tensor G3) with the Pixel 8 Pro (husky) and the Pixel 8 (shiba), tracked in [issue #1](https://github.com/derekross/omarchy-mobile/issues/1), so the SoC work is shared with [husky's port](../husky/NOTES.md). Facts are marked [V] (checked, with the source) or [I] (an inference to check on a phone). Stage 0 flashed and booted nothing of ours: its only write by hand was a Magisk-patched stock `init_boot_b`, for root on stock, and slot A's five boot images are Google's factory images byte for byte. + +Sources: + +- `R/`: read-only captures of a retail Pixel 8a with root (the live device tree, `fastboot getvar all`, the kernel log, `/proc`, `dumpsys`, and two partition backups), kept in `~/android/reference/`, never in the repository: facts only, no serials, IMEI or MACs. +- `F/`: Google's factory image `akita-cp3a.261005.005` (SHA-256 `416a76b2…`) and full OTA `akita-ota-cp3a.261005.005` (`daff3679…`), read on the laptop with `unpack_bootimg`, `avbtool info_image` and `mkdtboimg dump`. +- `G/`: Google's GPL device tree for akita, [kernel/devices/google/akita](https://android.googlesource.com/kernel/devices/google/akita/+/refs/tags/android-16.0.0_r0.10/dts/) at tag `android-16.0.0_r0.10`. +- `S/`: Google's GPL zuma SoC device tree, [kernel/devices/google/zuma](https://android.googlesource.com/kernel/devices/google/zuma/+/refs/tags/android-16.0.0_r0.10/dts/) at the same tag. +- `H/`: [husky's notes](../husky/NOTES.md) and [descriptor](../husky/device.conf), for what the two zuma phones share. + +## 2026-11-02: stage 0: a retail Pixel 8a (stock, rooted, bootloader unlocked) + +### Identity + +- **akita, zuma, MP1.0, SKU G6GPR** [V] (R/ `ro.product.device`, `ro.boot.hardware.platform`, `.revision`, `.sku`). `ro.soc.model` Tensor G3; launched with Android 14 (`ro.product.first_api_level` 34). +- **Nine CPUs in three clusters, as husky** [V] (R/ `/proc/cpuinfo`): four CPU part 0xd46 (Cortex-A510), four 0xd4d (Cortex-A715) and one 0xd4e (Cortex-X3). +- **8 GiB Micron LPDDR5, 128 GB Samsung UFS 3.1** (2 lanes, HS-G4 Series B) [V] (R/ `ro.boot.hardware.ddr`, `.ufs`, `getvar storage-*`). `MemTotal` is 7,754,796 kB. Husky's first phone has the same UFS; its second a Kioxia UFS 4.0 (H/). + +### Bootloader, build and both slots + +- **Starting point, 2026-11-01** [V] (R/): build CP3A.260905.009 (Android 17, security patch 2026-09-05), bootloader `akita-17.0-15681527`, unlocked (`ro.boot.flash.locked` 0, `vbmeta.device_state` unlocked, `verifiedbootstate` orange), stock rooted with Magisk 30.7 and running from slot B. +- **`getvar all`** [V] (R/; facts only): `product:akita`, `hw-revision:MP1.0`, `secure-boot:PRODUCTION`, `unlocked:yes`. As on husky, only the current slot's bootloader is reported. Anti-rollback counters 3 (`ap-ar-ns`, `ap-ar-s`, `gsa-bl1-ar`, `gsa-fw-ar`). Baseband `g5300o-260604-260807-B-16036236`. +- **Slot A started out `slot-successful:no`** (`slot-unbootable:no`, 3 tries) [V] (R/), and its five boot images were already byte-identical to the CP3A.261005.005 factory images (R/ pre-wipe backup against F/): an update staged on slot A that had never booted [I]. +- **Both slots on CP3A.261005.005** [V]. The full OTA (`ota-type=AB`, `pre-device=akita`, no `pre-build`, post-build `google/akita/akita:17/CP3A.261005.005/16271449`, security patch 2026-10-05; F/) was sideloaded twice from recovery: pass 1 installed to slot A and booted it, pass 2 did the same for slot B. Each slot was read from Android while it was the running slot (`ro.boot.slot_suffix`, `ro.build.id`, `ro.bootloader`): CP3A.261005.005 with bootloader `akita-17.0-15681527` on both. That is the confirmation `tools/install-phone --bootloader-slots-match akita-17.0-15681527` asks for. +- **The October build keeps September's bootloader and modem firmware** [V] (F/ `android-info.txt`: `require version-bootloader=akita-17.0-15681527`, `require version-baseband=g5300o-260604-260807-B-16036236`), and the anti-rollback counters stayed at 3 (R/ `getvar` afterwards). Anti-rollback only moves forward, so no build older than the one installed goes on this phone [I]. +- **A USB disconnect mid-sideload aborts the install with status 2** [V]: the laptop logged `USB disconnect` in the second the transfer stopped, and recovery answered `Install from ADB completed with status 2. Installation aborted.` The retry, with the cable left still, completed (`Total xfer: 2.00x`). +- **Then a factory reset, and root on slot B only** [V]. Magisk 31.1 patched the factory `init_boot.img`, keeping its AVB footer (`avbtool info_image`), and only `init_boot_b` was written (`fastboot flash init_boot_b`, then `--set-active=b`). Slot A's five boot images are now the factory images byte for byte, and slot B's are too, apart from `init_boot_b`, which is the patched image (R/ clean backup against F/). After the rooted boot both slots read `slot-successful:yes` (R/ `getvar`). Stock on slot A stays the way back; installing our build on slot B replaces the patch. +- **Magisk 31.1 has no root prompts** [V] (its release notes): `adb shell su` answers `Permission denied` until Shell is granted ahead of time in the app (Superuser tab, +). + +### How ABL picks the DTB and the dtbo entry + +- **The same four base DTBs as husky** [V] (F/ `vendor_kernel_boot`; none in `vendor_boot`): A0 FOPLP, A0 IPOP, B0 + B1 FOPLP and B0 + B1 IPOP, each with a `/soc_compatible` node and no `/soc_id`. They are S/'s `zuma_dtbs` (`zuma-a0-foplp`, `zuma-a0-ipop`, `zuma-b0-foplp`, `zuma-b0-ipop`). +- **This phone is IPOP** [V] (R/ live DT `/soc_compatible`: `B0_IPOP` and `B1_IPOP`, `product_id = <0x9865>`, `pkg_mode = <0x01>`; S/ `zuma-b0-ipop.dts`): ABL hands it the IPOP base DTB, where husky gets the FOPLP one (H/). So akita's `SOC_COMPATIBLE` is `b0-ipop:0x9865:1:0:1 b1-ipop:0x9865:1:1:1`, and our base DTB's `/soc_compatible` needs those two children. The exact revision, B0 or B1, is [I]: `/sys/devices/soc0/revision` reads 17 (R/), and its encoding isn't checked. +- **Board dtbo: entry 18 of 19, `board_id 0x40406`, `board_rev 0x10000`** [V] (F/ `dtbo.img`; R/ `androidboot.dtbo_idx` 18; G/ `zuma-akita-mp.dts`, the MP board overlay, model "ZUMA AKITA MP board based on ZUMA"). The other 18 entries are G/'s dev (0x40401), proto (0x40402), EVT (0x40403), DVT (0x40404) and PVT (0x40405) boards. +- **Stock's root compatible is `"google,ZUMA AKITA", "google,ZUMA"`** [V] (R/, G/). Ours follows husky's upstream style, `google,zuma-akita` [I] until its binding entry is written. + +### Boot images and verified boot + +- **The five slotted boot images, as husky** [V] (R/ `/dev/block/by-name`; F/): `boot`, `init_boot`, `vendor_boot`, `vendor_kernel_boot`, `dtbo`. +- **Headers** [V] (F/ `unpack_bootimg`): `boot` v4, the kernel only (no ramdisk, no OS version); `init_boot` v4, Android 17.0.0, patch level 2026-10, the generic ramdisk; `vendor_boot` v4, page size 0x800, no DTB; `vendor_kernel_boot` v4, page size 0x800, the four base DTBs and a ramdisk. +- **`vbmeta` chains `boot`, `init_boot`, `vbmeta_system` and `vbmeta_vendor`**, and holds hash descriptors for `vendor_boot`, `vendor_kernel_boot`, `dtbo` and the bootloader images [V] (F/ `avbtool info_image`). So, as on husky, slot B's `boot` and `init_boot` need AVB footers: partition sizes 0x4000000 and 0x800000 (R/ `getvar`, F/ footers), rollback index 1791158400 and security patch 2026-10-05 (F/), the values in husky's descriptor. +- **Partition sizes, the same as husky's** [V] (R/ `getvar`; H/): `boot`, `vendor_boot` and `vendor_kernel_boot` 64 MiB each, `init_boot` 8 MiB, `dtbo` 16 MiB, `vbmeta` 64 KiB, `modem` 200 MiB, `super` 7.95 GiB, `userdata` 117,744,685,056 bytes (109.7 GiB). +- **Stock's command line has the UART at `0x10870000`** [V] (F/ `vendor_boot`: `earlycon=exynos4210,0x10870000 console=ttySAC0,115200`, `bootconfig`; S/ `zuma.dtsi` `uart@10870000`), husky's `uart0` (H/). + +### Memory + +- **Root `#address-cells = <2>`, `#size-cells = <1>`** [V] (R/ live DT): 12-byte `reg` entries, as on husky. +- **RAM banks** [V] (R/): `0x80000000`, `0x880000000`, `0x900000000` and `0x980000000`, 2 GiB each (8 GiB): husky's first four (H/). +- **`reserved-memory`: 51 children, the same split as husky's** [V] (R/; H/): 30 fixed with `no-map`, 7 fixed without (`ect_binary`, `ramoops_mem@fd3ff000`, `cp_rmem`, `cp_msi_rmem`, `cp_rmem_1`, `cp_aoc_rmem`, `seclog_mem`) and 14 dynamic pools. Every region H/ names is at the same address (`gsa@90200000`, `tpu_fw@93000000`, `aoc@94000000`, `xhci_dma_dram@97000000`, `abl@f8800000`, `bldr_log_reserved@fd800000`). That all 51 match husky's region for region is [I] until the two live trees are compared. +- **`/ect`** [V] (R/): `parameter_address = <0x90000000>`, `parameter_size = <0x14000>`, as in husky's live tree. + +### Display, touch and input + +- **Panel: 1080x2400, with 60 and 120 Hz modes** [V] (R/ `dumpsys display`; G/ `zuma-akita-display.dtsi`, mode `1080x2400`). G/ describes two panels, `google,ak3a` and `google,ak3b`; this phone has the ak3b (R/ kernel log: `panel-google-ak3b` on the DSIM at `0x19440000`). Which panel another 8a has is [I]. +- **DECON0 is at `0x19470000`** [V] (S/ `zuma-drm-dpu.dtsi`, `drmdecon@19470000`), as on husky. Its `TRIG_CON` value at handover hasn't been read on an 8a, so the descriptor writes no display register (no `SIMPLEFB_TRIG_CON`). +- **Touch: Goodix** (`goodix_ts0`), firmware `goodix_firmware_ak3b.bin`, matched to the panel [V] (R/ input devices, kernel log). **Fingerprint: Goodix** (`goodix_fingerprint`); **haptics: Cirrus CS40L26** (`cs40l26_input`); and `gpio_keys` [V] (R/ input devices). + +### Partitions and backups + +- **The same partitions as husky** [V] (R/ `/dev/block/by-name` against H/): four LUNs `sda`-`sdd`; slotted `abl`, `bl1`, `bl2`, `bl31`, `pbl`, `gsa`, `gsa_bl1`, `gcf`, `ldfw`, `tzsw`, `dram_train`, `dpm`, `modem`, `pvmfw`, `vbmeta`, `vbmeta_system`, `vbmeta_vendor` and the five boot images; not slotted `persist`, `efs`, `efs_backup`, `modem_userdata`, `devinfo`, `mfg_data`, `pinfo`, `fips`, `frp`, `klog`, `blenv`, `misc`, `metadata`, `trusty_persist`, `trusty_userdata`, `ufs_internal`, `super`, `userdata`. +- **Two read-only backups** [V] (R/): every partition except `userdata`, `super` and the whole LUN `sda` (63 partitions, 1.6 GB), each hashed on the phone before and after its copy and on the laptop, all three matching. One was taken before the wipe (on CP3A.260905.009), one of the clean, rooted phone. +- **Between the two, stock changed `efs`, `efs_backup`, `persist` and `modem_userdata`** (its modem stack writes them), along with `devinfo`, `frp`, `metadata`, `misc`, `trusty_persist`, `dram_train_a/b` and `ufs_internal`; `mfg_data`, `pinfo`, `fips`, `blenv` and `modem_a/b` didn't change [V] (R/). So later checksum checks compare against the clean backup. + +### What `device.conf` rests on + +The descriptor carries no comments; this table is its provenance. + +| Key | Value | Mark | Source | +| --- | --- | --- | --- | +| `CODENAME`, `NAME`, `SOC` | akita, Pixel 8a, zuma | [V] | R/ `ro.product.device`, `ro.product.model`, `ro.boot.hardware.platform` | +| `COMPATIBLE` | `google,zuma-akita` | [I] | husky's upstream style (H/); the binding entry comes with the board DTS | +| `PACKAGE` | `omamobile-device-akita` | | the package doesn't exist yet; `bin/omamobile initramfs` builds the freestanding helpers when a package has no `omamobile-bootctl.c`, as for husky | +| `DTB` | `exynos/google/zuma-akita.dtb` | | the board DTS isn't written yet, so `DEVICE=akita bin/omamobile images` waits for it | +| `SOC_COMPATIBLE` | `b0-ipop:0x9865:1:0:1 b1-ipop:0x9865:1:1:1` | [V] | R/ live DT `/soc_compatible`; S/ `zuma-b0-ipop.dts` | +| `AVB_FOOTERS`, `AVB_ROLLBACK_INDEX`, `AVB_SECURITY_PATCH` | `boot:0x4000000 init_boot:0x800000`, 1791158400, 2026-10-05 | [V] | F/ `vbmeta.img` chain descriptors and the stock footers; R/ `getvar partition-size` | +| `DTBO_SOURCE`, `DTBO_BOARD_ID`, `DTBO_BOARD_REV` | the empty overlay, 0x40406, 0x10000 | [V] | F/ `dtbo.img` entry 18; R/ `androidboot.dtbo_idx`; G/ `zuma-akita-mp.dts` | +| `VENDOR_CMDLINE` | husky's line | [I] | H/; stock's UART is the same (F/) | +| `VENDOR_PAGESIZE` | 0x800 | [V] | F/ `vendor_boot` and `vendor_kernel_boot` headers | +| `OS_VERSION`, `OS_PATCH_LEVEL` | 17.0.0, 2026-10 | [V] | F/ `init_boot` header; the build on both slots (R/) | +| `BOOT_IMAGES`, `UFS_RW` | the five boot images; their `_b` names and `userdata` | [V] | R/ `/dev/block/by-name`; F/ | +| `INITRAMFS_INIT` | the shared init | [V] | as husky | +| `PANEL_SIZE` | 1080x2400 | [V] | R/ `dumpsys display`; G/ `zuma-akita-display.dtsi` | +| `SIMPLEFB_TRIG_CON`, `BRINGUP_PROBE` | unset | | DECON0's `TRIG_CON` at handover is read on a booted 8a before it is written anywhere; `BRINGUP_PROBE`'s addresses are gs201's | + +### Still needs the kernel or a phone + +1. The board DTS, `zuma-akita.dts` on our `zuma.dtsi`, aimed at M1 (USB and SSH, then the simplefb console) as in [husky's BRINGUP-M1](../husky/BRINGUP-M1.md): the IPOP `/soc_compatible` children, `/chosen/bootargs`, the 1080x2400 framebuffer and the fixed `reserved-memory` regions from R/, with a binding entry for `google,zuma-akita`. +2. DECON0's `TRIG_CON` at handover on an 8a, before `SIMPLEFB_TRIG_CON` goes in. +3. The silicon revision (B0 or B1). +4. `omamobile-device-akita`. diff --git a/device/akita/akita-m1-overlay.dts b/device/akita/akita-m1-overlay.dts new file mode 100644 index 000000000..828d73387 --- /dev/null +++ b/device/akita/akita-m1-overlay.dts @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Empty board overlay for the Pixel 8a bootloader (ABL). + * + * ABL picks a dtbo entry by board_id/board_rev and applies it on top of + * our base DTB. The stock overlay references Google labels that do not + * exist in the mainline DTB, so we ship one that changes nothing. + * board_id/board_rev are the entry a retail Pixel 8a boots: entry 18 of + * the stock dtbo.img (androidboot.dtbo_idx = 18), Google's MP board + * overlay zuma-akita-mp.dts (NOTES.md). + */ +/dts-v1/; +/plugin/; + +/ { + board_id = <0x40406>; + board_rev = <0x10000>; + + fragment@0 { + target-path = "/"; + __overlay__ { + }; + }; +}; diff --git a/device/akita/device.conf b/device/akita/device.conf new file mode 100644 index 000000000..8e0f9a86d --- /dev/null +++ b/device/akita/device.conf @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: MIT +CODENAME=akita +NAME="Pixel 8a" +SOC=zuma +COMPATIBLE="google,zuma-akita" +PACKAGE=omamobile-device-akita +DTB=exynos/google/zuma-akita.dtb +SOC_COMPATIBLE="b0-ipop:0x9865:1:0:1 b1-ipop:0x9865:1:1:1" +AVB_FOOTERS="boot:0x4000000 init_boot:0x800000" +AVB_ROLLBACK_INDEX=1791158400 +AVB_SECURITY_PATCH=2026-10-05 +DTBO_SOURCE=akita-m1-overlay.dts +DTBO_BOARD_ID=0x40406 +DTBO_BOARD_REV=0x10000 +VENDOR_CMDLINE="console=tty0 splash plymouth.graphical plymouth.force-scale=1 vt.global_cursor_default=0 clk_ignore_unused pd_ignore_unused printk.devkmsg=on bootconfig" +VENDOR_PAGESIZE=0x800 +OS_VERSION=17.0.0 +OS_PATCH_LEVEL=2026-10 +BOOT_IMAGES="boot init_boot vendor_boot vendor_kernel_boot dtbo" +UFS_RW="boot_b init_boot_b vendor_boot_b vendor_kernel_boot_b dtbo_b userdata" +INITRAMFS_INIT=/initramfs/init +PANEL_SIZE=1080x2400 diff --git a/docs/DEVICES.md b/docs/DEVICES.md index f6c58d929..b3303cbb8 100644 --- a/docs/DEVICES.md +++ b/docs/DEVICES.md @@ -70,7 +70,7 @@ Devices we'd like to support, with the closest starting point. Open an issue to | Pixel 6 | oriole | gs101 | **WIP, community port: [#2](https://github.com/derekross/omarchy-mobile/issues/2)**; our preferred second device. Upstream mainline `gs101-oriole.dts` | | Pixel 6 Pro | raven | gs101 | upstream mainline `gs101-raven.dts`; shares oriole's port ([#2](https://github.com/derekross/omarchy-mobile/issues/2)). Boots our kernel from slot B to Omarchy's Hyprland on the Mali-G78 ([kernel #2](https://github.com/derekross/linux-omarchy-mobile/pull/2), [#3](https://github.com/derekross/linux-omarchy-mobile/pull/3)); its device package and plans ([#41](https://github.com/derekross/omarchy-mobile/pull/41)) and provisioning tools ([#22](https://github.com/derekross/omarchy-mobile/pull/22)) are merged | | Pixel 6a | bluejay | gs101 | **WIP, community port: [#2](https://github.com/derekross/omarchy-mobile/issues/2)**; stage 0 facts from Google's GPL bluejay tree, no phone yet ([notes](../device/bluejay/NOTES.md)); its first-light board DTS (`gs101-bluejay.dts`) is in review, [kernel #179](https://github.com/derekross/linux-omarchy-mobile/pull/179), and in no published kernel yet; shares oriole's port | -| Pixel 8, 8 Pro, 8a | shiba, husky, akita | zuma (Tensor G3) | **WIP, community port: [#1](https://github.com/derekross/omarchy-mobile/issues/1)**. 8 Pro (husky): WIP, in the matrix above; its device package and UFS plan are merged ([#42](https://github.com/derekross/omarchy-mobile/pull/42)), and its bootloader picks the base DTB by `/soc_compatible`, not `/soc_id`. 8a (akita): wanted; the earlier hardware offer was withdrawn, and husky's zuma work carries over | +| Pixel 8, 8 Pro, 8a | shiba, husky, akita | zuma (Tensor G3) | **WIP, community port: [#1](https://github.com/derekross/omarchy-mobile/issues/1)**. 8 Pro (husky): WIP, in the matrix above; its device package and UFS plan are merged ([#42](https://github.com/derekross/omarchy-mobile/pull/42)), and its bootloader picks the base DTB by `/soc_compatible`, not `/soc_id`. 8a (akita): stage 0 stock facts and a descriptor from a retail phone ([notes](../device/akita/NOTES.md)); its bootloader picks the IPOP base DTB where husky's picks FOPLP, and its board DTS isn't written yet | | Pixel 9 family | tokay, caiman, komodo, comet, tegu | zumapro (Tensor G4) | 9a (tegu): WIP, in the matrix above; SoC patches are merging into linux-omarchy-mobile, the board DTS isn't public yet; tracking [#28](https://github.com/derekross/omarchy-mobile/issues/28) | | Pixel 10 family | mustang (10 Pro XL) | laguna (Tensor G5) | 10 Pro XL (mustang): stage 0 stock facts ([notes](../device/mustang/NOTES.md)), contributors welcome ([#18](https://github.com/derekross/omarchy-mobile/issues/18)) | | Pixel 11 Pro, 11 Pro XL, 11 Pro Fold | grizzly, kodiak, yogi | malibu (Tensor G6) | stock facts, contributors welcome: 11 Pro ([#26](https://github.com/derekross/omarchy-mobile/issues/26)), 11 Pro XL ([#199](https://github.com/derekross/omarchy-mobile/issues/199), [notes](../device/kodiak/NOTES.md)), 11 Pro Fold ([#40](https://github.com/derekross/omarchy-mobile/issues/40)) | diff --git a/tests/storage-guard b/tests/storage-guard index 409f5ec3d..efcec83a3 100755 --- a/tests/storage-guard +++ b/tests/storage-guard @@ -17,7 +17,7 @@ cheetah_rw="boot_b init_boot_b vendor_boot_b vendor_kernel_boot_b dtbo_b userdat gs101_rw="boot_b vendor_boot_b dtbo_b userdata" # --- Pack time: the real descriptors --- -for d in cheetah:"$cheetah_rw" felix:"$cheetah_rw" lynx:"$cheetah_rw" oriole:"$gs101_rw" bluejay:"$gs101_rw"; do +for d in cheetah:"$cheetah_rw" felix:"$cheetah_rw" lynx:"$cheetah_rw" akita:"$cheetah_rw" oriole:"$gs101_rw" bluejay:"$gs101_rw"; do dev=${d%%:*} want=${d#*:} DEVICE=$dev bin/omamobile initramfs-config "$t/etc-$dev" > "$t/log" 2>&1 || { cat "$t/log"; fail "$dev: initramfs-config"; } [[ $(cat "$t/etc-$dev/omamobile-ufs-rw") == "$want" ]] || fail "$dev packs its UFS_RW (got $(cat "$t/etc-$dev/omamobile-ufs-rw"))" @@ -31,7 +31,7 @@ if [[ $(grep -c '^ *UFS_RW=' initramfs/init) != 2 ]] || ! grep -q '^UFS_RW=""$' fail "initramfs/init has no allowlist of its own, only the packed one" fi grep -q '^ initramfs_config "\$stage/etc"$' bin/omamobile || fail "initramfs packs the files into the image's /etc" -pass "cheetah and felix pack the six-name list, oriole and bluejay their three boot images and userdata" +pass "cheetah, felix and akita pack the six-name list, oriole and bluejay their three boot images and userdata" # --- Pack time: refused descriptors, in a repository-shaped tree --- R=$t/repo diff --git a/tests/usb-product b/tests/usb-product index 6f0f4ea9d..1003057f9 100755 --- a/tests/usb-product +++ b/tests/usb-product @@ -10,12 +10,12 @@ pass() { printf 'ok - %s\n' "$1"; } t=$(mktemp -d); trap '[[ -n ${KEEP:-} ]] || rm -rf "$t"' EXIT # --- Pack time --- -for d in "cheetah:Pixel 7 Pro (M1)" "felix:Pixel Fold" "oriole:Pixel 6" "bluejay:Pixel 6a"; do +for d in "cheetah:Pixel 7 Pro (M1)" "felix:Pixel Fold" "oriole:Pixel 6" "bluejay:Pixel 6a" "akita:Pixel 8a"; do dev=${d%%:*} want=${d#*:} DEVICE=$dev bin/omamobile initramfs-config "$t/etc-$dev" > "$t/log" 2>&1 || { cat "$t/log"; fail "$dev: initramfs-config"; } [[ $(cat "$t/etc-$dev/omamobile-usb-product") == "$want" ]] || fail "$dev packs '$want' (got $(cat "$t/etc-$dev/omamobile-usb-product"))" done -pass "cheetah keeps 'Pixel 7 Pro (M1)'; felix, oriole and bluejay use their NAME" +pass "cheetah keeps 'Pixel 7 Pro (M1)'; felix, oriole, bluejay and akita use their NAME" R=$t/repo mkdir -p "$R/bin" "$R/device/six"