From 74f754ecef807a209d458fe270dbb0b75bd6a66c Mon Sep 17 00:00:00 2001 From: fossdd Date: Sun, 20 Apr 2025 15:09:31 +0200 Subject: [PATCH] systemd: versionize systemd-related provides Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6381 --- extra-repos/systemd/systemd/APKBUILD | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/extra-repos/systemd/systemd/APKBUILD b/extra-repos/systemd/systemd/APKBUILD index 88681e226..bf67b94e6 100644 --- a/extra-repos/systemd/systemd/APKBUILD +++ b/extra-repos/systemd/systemd/APKBUILD @@ -86,7 +86,12 @@ makedepends=" # provides=openrc and openrc-settingsd to prevent those packages # getting pulled in, as there are some conflicts (dbus) -provides="busctl eudev openrc-settingsd=$pkgver-r$pkgrel systemd-stage0=$pkgver-r$pkgrel" +provides=" + busctl=$pkgver-r$pkgrel + eudev=$pkgver-r$pkgrel + openrc-settingsd=$pkgver-r$pkgrel + systemd-stage0=$pkgver-r$pkgrel + " provider_priority=100 install="$pkgname.pre-install" @@ -249,7 +254,11 @@ udevd() { # is a dependency of systemd # NOTE: should only be udev, but packages hardcode eudev - provides="eudev udev eudev-libs" + provides=" + eudev=$pkgver-r$pkgrel + udev=$pkgver-r$pkgrel + eudev-libs=$pkgver-r$pkgrel + " provider_priority=100 amove etc/udev @@ -378,7 +387,7 @@ logind() { shadow " - provides="elogind" + provides="elogind=$pkgver-r$pkgrel" provider_priority=100 amove usr/bin/loginctl @@ -432,7 +441,12 @@ x11() { } dev() { - provides="eudev-dev udev-dev elogind-dev systemd-stage0-dev=$pkgver-r$pkgrel" + provides=" + eudev-dev=$pkgver-r$pkgrel + udev-dev=$pkgver-r$pkgrel + elogind-dev=$pkgver-r$pkgrel + systemd-stage0-dev=$pkgver-r$pkgrel + " provider_priority=100 default_dev