diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD index 0e46d9efa..00421dd15 100644 --- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD +++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD @@ -3,7 +3,7 @@ # pmbootstrap installs this, if systemd is selected in "pmbootstrap init". pkgname=postmarketos-base-systemd pkgver=37 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for running postmarketOS with systemd" url="https://postmarketos.org" arch="noarch" @@ -38,6 +38,8 @@ depends=" systemd-timesyncd tzdata " +provides="postmarketos-base-init" +provider_priority=100 replaces="alpine-baselayout postmarketos-base systemd systemd-logind" replaces_priority=100 install=" diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index fffe165f9..8e971cad6 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base pkgver=43 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" @@ -90,6 +90,11 @@ prepare() { } package() { + # pmos-base-init provided by a subpackage in this APKBUILD, and it may not + # exist when this is evaluated at the top level. It's moved into this + # function to work around it. + depends="$depends postmarketos-base-init" + local i for i in $_source440; do install -Dm440 "$srcdir/$(flatpath "$i")" "$pkgdir/$i" @@ -129,7 +134,8 @@ nftables_openrc() { } openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" + provides="$pkgname-init" + provider_priority=10 install="$subpkgname.post-install $subpkgname.post-upgrade" replaces=" busybox-openrc @@ -138,9 +144,11 @@ openrc() { zram-init-openrc " depends=" + !systemd eudev-openrc logbookd logbookd-openrc + openrc openssh-server-common-openrc udev-init-scripts-openrc zram-init-openrc