- Decision
- ADR-163
- Date
- 2026-10-13
- Status
- AcceptedAccepted (owner, 2026-10-13)
- Mentions
- ADR-098
- Mentioned by
- ADR-234
1Decision
Consolidate the exported patch series of sovereignos-platform outside datamap from 71 patches to 33, joining only neighbouring patches that fix or rewrite each other (airpods 19 → 8, credential/duress-unlock-decoy 18 → 9, credential/duress-unlock-dummy 6 → 3, launcher/app-drawer 12 → 2, guardian 5 → 2, branding/boot 3 → 2, memory/zram-size 2 → 1), and move the decoy landing narratives from its SOURCE.md to HISTORY.md. It follows ADR-098 and leaves the Data Map package, whose series has its own plan, untouched.
2Why and evidence
A reviewer or a rebase onto a new GrapheneOS release meets one patch per concern instead of a chain of fixups that undo each other (the AirPods Bluetooth series added and later removed 60 lines of SDP hooks; the guardian series moved a PRODUCT_PACKAGES entry twice).
3Consequences
Each squashed series gives the same tree hash as the landed series on the same base, checked in a disposable repository seeded from the build server, and again from the exported files. Nothing was built or run on a device. The build-server branches keep the landed commits, so the hashes in the SOURCE.md files stay the landed ones; patch numbers cited in older records are landed numbers, mapped in each package's SOURCE.md.
4Review when
A new package series grows beyond a handful of patches, or a rebase shows a squashed patch is too large to carry.
Read from docs/governance/decision-log.md, entry ADR-163.