omarchy-mac-boot: require the HOOKS baseline once the source relies on it
From omacom/omarchy-mac#544 the Apple drop-ins no longer add Plymouth themselves and build on omarchy-settings' 00-omarchy-hooks.conf (#536). A settings version cannot express that (quattro candidates sort below stock releases and omarchy pins its settings exactly), so a build whose payload has no 93-omarchy-mac-plymouth.conf depends on the name omarchy-mkinitcpio-hooks-baseline, which settings packages that ship the baseline must provide.
This commit is contained in:
1 parent
cd1ffe0f7e
commit
67dd0f7e6b
2 files changed
+13
No files matched your search
@@ -45,6 +45,15 @@ package() {
|
|||||||
'gzip' 'kbd' 'mkinitcpio' 'sed' 'systemd' 'util-linux')
|
'gzip' 'kbd' 'mkinitcpio' 'sed' 'systemd' 'util-linux')
|
||||||
|
|
||||||
"$srcdir/boot/install" "$pkgdir"
|
"$srcdir/boot/install" "$pkgdir"
|
||||||
|
# Once the source drops its own Plymouth fragment (omacom/omarchy-mac#544),
|
||||||
|
# the Apple drop-ins build on omarchy-settings' HOOKS baseline
|
||||||
|
# (/etc/mkinitcpio.conf.d/00-omarchy-hooks.conf, omacom/omarchy-mac#536), and
|
||||||
|
# an older settings package leaves Plymouth out of the Mac initramfs. A
|
||||||
|
# settings version cannot say so (quattro candidates sort below stock
|
||||||
|
# releases, and omarchy pins its settings exactly), so the settings packages
|
||||||
|
# that ship the baseline provide it by name.
|
||||||
|
[[ -e $pkgdir/etc/mkinitcpio.conf.d/93-omarchy-mac-plymouth.conf ]] ||
|
||||||
|
depends+=('omarchy-mkinitcpio-hooks-baseline')
|
||||||
printf '%s\n' "$_commit" | install -Dm644 /dev/stdin "$pkgdir/usr/share/omarchy-mac/boot-source-revision"
|
printf '%s\n' "$_commit" | install -Dm644 /dev/stdin "$pkgdir/usr/share/omarchy-mac/boot-source-revision"
|
||||||
|
|
||||||
# Administrator-editable: every /etc path and the initramfs helpers an image
|
# Administrator-editable: every /etc path and the initramfs helpers an image
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ The package is aarch64-only and published to edge only. It widens to rc and stab
|
|||||||
|
|
||||||
It requires `limine-mkinitcpio-hook` 1.39.0-2 or newer: that is the first build whose hooks leave a Mac's `/boot` to mkinitcpio until Limine is activated. With an older hook, Limine's kernel hook replaces mkinitcpio's by name, and this package's `limine-ready` gate stops it on a Mac that still boots GRUB, so a kernel update would never reach `/boot`.
|
It requires `limine-mkinitcpio-hook` 1.39.0-2 or newer: that is the first build whose hooks leave a Mac's `/boot` to mkinitcpio until Limine is activated. With an older hook, Limine's kernel hook replaces mkinitcpio's by name, and this package's `limine-ready` gate stops it on a Mac that still boots GRUB, so a kernel update would never reach `/boot`.
|
||||||
|
|
||||||
|
## HOOKS baseline
|
||||||
|
|
||||||
|
From the source that drops the boot package's own Plymouth fragment (omacom/omarchy-mac#544), the Apple drop-ins build on omarchy-settings' HOOKS baseline, `/etc/mkinitcpio.conf.d/00-omarchy-hooks.conf` (omacom/omarchy-mac#536). With an older settings package the Mac initramfs loses Plymouth at the passphrase prompt. A settings version cannot express this: quattro candidate builds sort below stock releases, and `omarchy` pins its settings version exactly. So when the staged payload has no `93-omarchy-mac-plymouth.conf`, `package()` adds a dependency on the name `omarchy-mkinitcpio-hooks-baseline`. Every settings package that ships the baseline on aarch64 (`omarchy-settings`, `omarchy-settings-dev`, candidate builds) must `provide` that name. Until one does, such a build of this package cannot be installed: it fails outright rather than silently booting without Plymouth.
|
||||||
|
|
||||||
## Transition
|
## Transition
|
||||||
|
|
||||||
- It provides, conflicts with and replaces `omarchy-apple-boot` and `omarchy-first-boot`. The scriptlet moves a pending `omarchy-first-boot` marker to `omarchy-mac-first-boot`, drops the replaced unit's dangling enable link and points at a customised `90-omarchy-asahi.conf.pacsave`.
|
- It provides, conflicts with and replaces `omarchy-apple-boot` and `omarchy-first-boot`. The scriptlet moves a pending `omarchy-first-boot` marker to `omarchy-mac-first-boot`, drops the replaced unit's dangling enable link and points at a customised `90-omarchy-asahi.conf.pacsave`.
|
||||||
|
|||||||
Reference in new issue
Block a user