Skip to content

m1n1-aurora: refuse linux-aurora older than aurora16 - #2435

Merged
maralcbr merged 1 commit into
masterfrom
m1n1-aurora-kernel-floor
Nov 10, 2026
Merged

maralcbr merged 1 commit into
masterfrom
m1n1-aurora-kernel-floor

Conversation

@maralcbr

Copy link
Copy Markdown
Member

Summary

m1n1-aurora aurora23 (#2425) turns on the display and GPU handoff for the J504, J514C, J514M and J516M. Those boards need the board records in linux-aurora 7.2.11.aurora16 (#2424). omacom/m1n1#25 promised the package would carry that floor; #2425 shipped without it.

 pkgbuilds/m1n1-aurora/PKGBUILD
-pkgrel=1
+pkgrel=2
-conflicts=('m1n1' 'aura' 'm1n1-neo')
+conflicts=('m1n1' 'aura' 'm1n1-neo' 'linux-aurora<7.2.11.aurora16')

A conflict, not a dependency: linux-aurora already depends on m1n1>=1.6.1, and the loader should never pull a kernel onto an install by itself. pkgrel bumps because the source is unchanged (docs/releases.md).

Evidence

  • tests/aurora-edge/metadata.py now expects the floor in conflicts and no linux-aurora entry in depends. Before: the test pinned the old three-entry list. After: CI on this PR.
  • Not run locally: no pacman or makepkg on the review machine.

Merge Danger

Door: two-way

Blast Radius: Mac installs

  • -Syu upgrades the kernel and the loader in one transaction, so edge users see nothing.
  • With linux-aurora held below aurora16 (IgnorePkg, or a lone pacman -S m1n1-aurora), pacman reports a conflict and offers to remove the kernel, default No.
  • This applies to every board, not only the four that need it, and it stops a kernel rollback below aurora16 while this loader is installed. Limine snapshot rollback restores both packages together, so it is unaffected.

The aurora23 handoff defaults for the J504, J514C, J514M and J516M need the
board records in linux-aurora 7.2.11.aurora16, as m1n1#25 promised. Use a
versioned conflict: linux-aurora already depends on m1n1, and the loader
should never pull a kernel in on its own.

Signed-off-by: Marcelo Alcantara <maralc@gmail.com>
@maralcbr
maralcbr marked this pull request as ready for review November 10, 2026 12:38
@maralcbr
maralcbr merged commit 00b66b0 into master Nov 10, 2026
11 checks passed
@greptile-apps

greptile-apps Bot commented Nov 10, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge with the older-kernel restrictions described by the author.

Summary

m1n1-aurora now conflicts with linux-aurora versions below 7.2.11.aurora16, without adding a kernel dependency.

  • The loader blocks older Aurora kernels without pulling in a kernel.

maralcbr explicitly acknowledges that the floor applies to every board, blocks older kernel rollbacks, and can prompt users to remove an older kernel during a targeted install. These are intentional tradeoffs, not reported findings.

Reviews (1) · Last reviewed commit: "m1n1-aurora: refuse linux-aurora older t..." · Reviewed by Greptile

@github-actions

Copy link
Copy Markdown
Contributor

Publish succeeded → live

Packages: m1n1-aurora (aarch64, PR artifact)

  • edge/aarch64: m1n1-aurora-1.6.1.aurora23-2-aarch64

Commit 00b66b0 · run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant