diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 1a3c69d0c..8714735c1 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,15 +1,23 @@ pkgname=postmarketos-base pkgver=44 -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 @@ -41,6 +49,14 @@ replaces=" " replaces_priority=100 # leave plenty for alpine +# Every postmarketos installation with pmbootstrap <= 3.3.2 has +# alpine-base in /etc/apk/world. But for multiple reasons, we do not +# want to depend on it. So have a versioned provides that conflicts +# with it. See the commit that introduced this message for more details +# THE LINE BELOW MUST NOT BE REMOVED UNTIL WE ARE READY TO DEPEND ON +# alpine-base AGAIN +provides="alpine-base=1000-r0" + _source440=" etc/sudoers etc/doas.d/10-postmarketos.conf @@ -160,6 +176,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..f55b3af49 100644 --- a/pmaports.cfg +++ b/pmaports.cfg @@ -1,7 +1,7 @@ # Reference: https://postmarketos.org/pmaports.cfg [pmaports] version=7 -pmbootstrap_min_version=2.3.2 +pmbootstrap_min_version=2.3.3 channel=edge supported_root_filesystems=btrfs,ext4,f2fs supported_firewall=nftables @@ -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