Repository navigation
Sort handheld dev pkgvers above upstream omarchy-dev - #82
DanielJBurbridge merged 2 commits into
Conversation
Model: grok-4.7 Co-authored-by: Daniel Burbridge <DanielJBurbridge@users.noreply.github.com>
DanielJBurbridge
left a comment
There was a problem hiding this comment.
dev-red review: FAIL (mechanical only) at a1ced8d
B1: this head conflicts with integ e9fca47 (#81 merged) in docs/handheld/alpha-followups.md, where L220 and L230 sit next to each other. Re-merge. Tests also has to go green on the new head; it was still running on this one. Once both are done I'll pass it on a narrow delta check, and the code needs no other change.
(1) vercmp: all claims are verified with a port of alpm's rpmvercmp. Taking 4.0.0.202611170358.r8123.handheld.a1ced8d6 as our build:
- It is newer than
4.0.0.r7967.g3b36b9e,4.0.0.r999999.gffffffffanddev.202611170222.e742281c. The 12-digit stamp is a numeric segment against the letterr, and a numeric segment wins. Againstdev, the numeric4beats the letters. - It is older than
4.0.1.r1.g0000000. - Date beats count:
…202611180000.r1…is newer than…202611170358.r8123…. .dirtysorts above the clean build of the same commit. That's harmless.
(3) Upgrade from the dev.* builds: a plain pacman -U is an upgrade, because the numeric segment beats dev. A deliberate move back to upstream while it's still 4.0.0.r* is an explicit downgrade (pacman -U of the repo or saved package, or pacman -S), and the HANDOFF says so. Without that, omarchy update keeps ours.
(2) The 4.0.1 yield: medium follow-up (L220 range), not blocking this PR. It's acceptable for the alpha only if it fails safe. As things stand, the day upstream moves to 4.0.1, a routine omarchy update silently swaps our builds out again, and the Ally falls back into the same sddm relogin loop, a device with no way in. Documenting it isn't enough, because the person running omarchy update won't read HANDOFF first. I wouldn't add an epoch or IgnorePkg: an epoch sticks forever, and IgnorePkg is hidden pacman.conf state that also blocks intended updates. The safer fix is a pacman hook in omarchy-gaming-session on omarchy-dev and omarchy-settings-dev upgrades. When the installed pkgver lacks .handheld., it turns off handheld autologin and leaves the normal desktop greeter, with a message saying how to reinstall the handheld build. That stops the loop whatever upstream does.
Low: HANDOFF:34 uses pacman -Sy <pkgs>, which is a partial upgrade on Arch. Use pacman -Syu first, or pacman -S without -y.
There's a Model trailer (grok-4.7), and no follow-up lines are removed.
Keep L220 and L230. L221 records the open relogin risk when upstream moves to 4.0.1. The handoff realign step is a full pacman -Syu. Model: grok-4.7 Co-authored-by: Daniel Burbridge <DanielJBurbridge@users.noreply.github.com>
DanielJBurbridge
left a comment
There was a problem hiding this comment.
dev-red delta review: PASS at ea471ee
- B1 is fixed. e9fca47 is merged in, and
git merge-treeagainst current integ 10a24c6 is clean. Nothing is removed from the follow-ups. bin/is unchanged since a1ced8d. The onlytest/change is #81's own test coming in with the merge, so the vercmp verification from review 5932603045 still holds.- L220 points to #84's hook, and HANDOFF:34 now uses
-Syu. - Model trailer: grok-4.7.
- Actions
testandi18n-checkare green on this head.
Cleared to merge at this sha.
bbaac86
into
feat/ally-parity-integration-20261111
What changes
Handheld
omarchy-devandomarchy-settings-devbuilds useddev.<yyyymmddHHMM>.<sha8>. pacman'svercmpranks a numeric segment above an alphabetic one, so upstream4.0.0.r7967.g3b36b9esorted newer.omarchy updatereplaced the Ally packages with that upstream build and sddm went into a relogin loop.Chose a variant of (a). Not (b) epoch.
omarchy dev pkg-testnow sets:<base>.<commit UTC yyyymmddHHMM>.r<count>.handheld.<sha8>[.dirty]<base>is the checkoutversionfile with a trailing.alpharemoved, so4.0.0.alphapublishes4.0.0, the base upstreamomarchy-devalready uses. The stamp is the committer time in UTC and sits in the segment where upstream puts the letterr.r<count>is still the total commit count, as the omarchy-dev PKGBUILD describes it.Literal (a),
<base>.r<count>.handheld.<date>.<sha>, loses as soon as upstream's commit count passes this fork. The fork is only about a hundred commits ahead ofr7967. Epoch stays above every later upstream version, including4.0.1and9.0.0, so coming back needspacman -Uor an epoch bump on each of them. This scheme stays above every4.0.0.rNand yields when the base moves to4.0.1or later. Until that bump, going back issudo pacman -U.The next deploy upgrades an Ally that is still on
dev.*.This follows Arch's VCS pkgver and pacman's vercmp rule that a numeric segment is newer than an alphabetic one. It is the same idea as a CachyOS
pkgrelof1.1: newer than the package that is current, older than the next real upstream version. The Arch PKGBUILD guidelines treat epoch as a last resort because it blocks that next version.Claims follow-ups L220–L229. L220 records the fix. L221 is open: when upstream's base moves to 4.0.1,
omarchy updatecan bring the relogin loop back. The proposed hook is not in this PR. Re-merged ontoe9fca470(#81) and kept L230.The handoff realign step is
sudo pacman -Syu omarchy-settings-dev omarchy-dev, not a partialpacman -Sy.Model: grok-4.7
Verification
vercmpfrom pacman 6.0.2. A positive result means the first version is newer.bash test/shell.d/dev-pkgver-test.shpassed those comparisons against versions the script built from a fixture checkout. Withvercmptaken offPATH, that part of the file skips and the file exits 0.Screenshots
No visible change: package version strings only.