Re-pin omarchy-mac and omarchy-mac-boot to omarchy-mac-pkgs 2a3ed89
main now has the docs and CI pin from omarchy-mac-pkgs#7 and the device tree overlays from #3. omarchy-mac 0.1.0-12 and omarchy-mac-boot 20261004-2 (same commit date, so pkgrel 2). omarchy-mac-boot's overlay tests need dtc in checkdepends.
This commit is contained in:
1 parent
0de65be033
commit
550a9dc382
4 files changed
+13
-10
No files matched your search
@@ -8,21 +8,23 @@ pkgname=omarchy-mac-boot
|
||||
# 20260921-N. Reset pkgrel to 1 when pkgver changes; bump it to re-pin or
|
||||
# rebuild on the same day.
|
||||
pkgver=20261004
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Apple Silicon boot support for Omarchy: initramfs, in-place encryption, first boot and Limine activation'
|
||||
arch=('aarch64')
|
||||
groups=('omarchy-platform-apple-silicon')
|
||||
url='https://github.com/omacom/omarchy-mac-pkgs'
|
||||
license=('MIT')
|
||||
makedepends=('git')
|
||||
# The device tree overlay tests run dtc, fdtoverlay and fdtget.
|
||||
checkdepends=('dtc')
|
||||
provides=('omarchy-apple-boot' 'omarchy-first-boot')
|
||||
conflicts=('omarchy-apple-boot' 'omarchy-first-boot')
|
||||
replaces=('omarchy-apple-boot' 'omarchy-first-boot')
|
||||
install=omarchy-mac-boot.install
|
||||
# An exact omarchy-mac-pkgs main commit, never a branch.
|
||||
_commit=43991059e17bb0ab7e0ecf0010aef1fa73c3e2c9
|
||||
_commit=2a3ed89eb20c5695f6291698b6646a49f8f6489d
|
||||
source=("omarchy-mac-pkgs::git+https://github.com/omacom/omarchy-mac-pkgs.git#commit=${_commit}")
|
||||
sha256sums=('654f54364a675ae9aa03728c49e5558121a7be70d60226cd8fdd4f901b195ee1')
|
||||
sha256sums=('ab951984268adadff8352009f63f1b001c3b09d14d47454b9efe06a54b3019ab')
|
||||
|
||||
prepare() {
|
||||
# Tests and staging must not be able to read the other package's tree.
|
||||
|
||||
@@ -28,10 +28,11 @@ A new pin publishes on merge, so check what the pinned source needs first. The r
|
||||
|
||||
## Transition
|
||||
|
||||
- **From omacom/omarchy-mac-pkgs (20261004-1).** The package no longer carries the migration engine: `omarchy-mac-migrate`, `/usr/lib/omarchy/mac-boot/migrate`, the `migrate-*.sh` modules and `omarchy-mac-migrate-verify.service`. pacman removes them on upgrade, and the scriptlet drops the verify unit's enable link the engine left. Converting a fork or mx-mac Mac is a separate migration script. A Mac stopped between a migration's reboot and its verification (`/var/lib/omarchy-mac/migration/reboot-pending`) must finish it before this upgrade: afterwards nothing verifies that boot.
|
||||
- **From omacom/omarchy-mac-pkgs (20261004-2).** The package no longer carries the migration engine: `omarchy-mac-migrate`, `/usr/lib/omarchy/mac-boot/migrate`, the `migrate-*.sh` modules and `omarchy-mac-migrate-verify.service`. pacman removes them on upgrade, and the scriptlet drops the verify unit's enable link the engine left. Converting a fork or mx-mac Mac is a separate migration script. A Mac stopped between a migration's reboot and its verification (`/var/lib/omarchy-mac/migration/reboot-pending`) must finish it before this upgrade: afterwards nothing verifies that boot.
|
||||
|
||||
- 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 dangling enable links of the replaced unit and of the removed migration verifier, and points at a customised `90-omarchy-asahi.conf.pacsave`.
|
||||
- `pkgver` is the UTC commit date of the pin, so any pin from `20260925` on upgrades the fork's `20260921-10` on mx-mac Macs. The files the fork shipped that the source no longer does (the image finalize tools, the upstream ARM repository key and the GRUB snapshot-menu hook) are removed by that upgrade.
|
||||
- **Device tree overlays (omacom/omarchy-mac-pkgs#3).** Other packages may drop overlays into `/usr/lib/omarchy-mac-boot/dtb-overlays/`, which this package owns; `/etc/default/update-m1n1` applies them and the boot check rebuilds `boot.bin` the same way. With none installed, `boot.bin` is unchanged. A Mac with its own copy of `/etc/default/update-m1n1` keeps it (the shipped one lands as `.pacnew`), and then update-m1n1 applies no overlays until it is merged. The overlay hook does not run in the transaction that first installs it.
|
||||
- `backup=` covers every `/etc` file and `/usr/lib/omarchy/initcpio`. It includes `/etc/default/update-m1n1`, which pins update-m1n1's device-tree order to the C locale. On a Mac that already has its own unowned copy, pacman keeps it and installs the shipped one as `.pacnew`. The snapshot restore hooks in `/etc/boot/hooks` are symlinks to `/usr/bin/omarchy-mac-snapshot-check`, not files, so they stay out of it.
|
||||
|
||||
## Updates
|
||||
@@ -43,4 +44,4 @@ Updates are reviewed pins, never a branch:
|
||||
3. Refresh `sha256sums` with `makepkg -g`.
|
||||
4. Check the pin against [Publish order](#publish-order). `omarchy-mac` must be published at or past omacom/omarchy-mac#535, or re-pinned in the same pull request.
|
||||
|
||||
`20261004-1` sorts above edge's `20260927-1` and every lab candidate up to `20260928-3`.
|
||||
`20261004-2` sorts above edge's `20260927-1`, the first draft of this pin (`20261004-1`) and every lab candidate up to `20260928-3`.
|
||||
@@ -5,7 +5,7 @@ pkgname=omarchy-mac
|
||||
# pkgver matches omarchy-mac/version at _commit. Bump pkgrel to re-pin or
|
||||
# rebuild the same add-on version; reset it to 1 when pkgver increases.
|
||||
pkgver=0.1.0
|
||||
pkgrel=11
|
||||
pkgrel=12
|
||||
pkgdesc='Apple Silicon configuration and support services for Omarchy'
|
||||
arch=('aarch64')
|
||||
groups=('omarchy-platform-apple-silicon')
|
||||
@@ -18,9 +18,9 @@ license=('MIT')
|
||||
makedepends=('git' 'findutils')
|
||||
checkdepends=('diffutils' 'python' 'systemd')
|
||||
# An exact omarchy-mac-pkgs main commit, never a branch.
|
||||
_commit=43991059e17bb0ab7e0ecf0010aef1fa73c3e2c9
|
||||
_commit=2a3ed89eb20c5695f6291698b6646a49f8f6489d
|
||||
source=("omarchy-mac-pkgs::git+https://github.com/omacom/omarchy-mac-pkgs.git#commit=${_commit}")
|
||||
sha256sums=('654f54364a675ae9aa03728c49e5558121a7be70d60226cd8fdd4f901b195ee1')
|
||||
sha256sums=('ab951984268adadff8352009f63f1b001c3b09d14d47454b9efe06a54b3019ab')
|
||||
|
||||
prepare() {
|
||||
# Tests and staging must not be able to read the other package's tree.
|
||||
|
||||
@@ -12,7 +12,7 @@ Installing the package enables no system services, but its vendor configuration
|
||||
|
||||
`depends` carries what every Mac needs, so an offline first boot has it and an owner can't remove it: the speaker stack with `speakersafetyd` named (its unit is this package's preset), `alsa-ucm-conf-asahi`, `rtkit`, `pipewire-alsa`, `pipewire-pulse`, `vulkan-asahi` and `asahi-alarm-keyring` (the keyring of the `[asahi-alarm]` repository, named in the platform root's `keyrings`). avd-fw, libva-v4l2_request-avd, wf-recorder and widevine stay out: they are removable defaults in the runtime's Apple package list. Runtime dependencies are declared in `package()`, so the builder stages and tests the add-on without installing the desktop.
|
||||
|
||||
## What 0.1.0-11 drops
|
||||
## What 0.1.0-11 and later drop
|
||||
|
||||
From omacom/omarchy-mac-pkgs the package no longer ships the fork's `legacy/` copies (`/usr/share/omarchy-mac/legacy`) or the setup that retired them; pacman removes them on upgrade. The Apple pacman templates, the `omarchy-hw-apple` alias, the copies under `/usr/share/omarchy` and the platform Hyprland files that lab candidates 0.1.0-7 to 0.1.0-10 carried are gone too: Omarchy from omacom/omarchy#13362 owns the templates and the detector, and the Hyprland defaults wait for a core slot. Converting a fork or mx-mac Mac is a separate migration script, not this package.
|
||||
|
||||
@@ -29,4 +29,4 @@ Updates are reviewed pins, never a branch. To release a change to the add-on:
|
||||
2. Reset `pkgrel` to 1 when `pkgver` increases; bump it to re-pin or rebuild the same version.
|
||||
3. Refresh `sha256sums` with `makepkg -g`.
|
||||
|
||||
Commits that touch only `omarchy-mac-boot/`, the manual or the tools do not need a new pin. `0.1.0-11` sorts above edge's `0.1.0-6` and every lab candidate up to `0.1.0-10`.
|
||||
Commits that touch only `omarchy-mac-boot/`, the manual or the tools do not need a new pin. `0.1.0-12` sorts above edge's `0.1.0-6`, the first draft of this pin (`0.1.0-11`) and every lab candidate up to `0.1.0-10`.
|
||||
Reference in new issue
Block a user