diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 8e971cad6..c76cf8e51 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,15 +1,23 @@ pkgname=postmarketos-base pkgver=43 -pkgrel=2 +pkgrel=3 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" license="GPL-3.0-or-later" makedepends="postmarketos-initramfs" +# Several of these dependencies come from alpine - base, as the upstream +# recommendation to not depend on openrc has been to copy them here: +# https: // gitlab.alpinelinux.org/alpine/aports/-/merge_requests/71686#note_435428 depends=" - alpine-base + alpine-baselayout + alpine-release + apk-tools + busybox + busybox-suid devicepkg-utils>=0.2.0 eudev + musl-utils openssh-server-pam postmarketos-keys postmarketos-mvcfg @@ -145,6 +153,9 @@ openrc() { " depends=" !systemd + alpine-conf + busybox-mdev-openrc + busybox-openrc eudev-openrc logbookd logbookd-openrc diff --git a/pmaports.cfg b/pmaports.cfg index 7e4cea8a6..6000a2a51 100644 --- a/pmaports.cfg +++ b/pmaports.cfg @@ -15,7 +15,7 @@ supported_heimdall_depends=heimdall,android-tools [repo:systemd] pmaports_dir=systemd # Build forks of Alpine packages that support usr_merge -bootstrap_1=abuild alpine-base +bootstrap_1=abuild bootstrap_2=systemd # Build systemd related pkgs without deps on each other bootstrap_3=dbus linux-pam-pmos