From 44688263bd502098a1ff1b2fd92731339c2daf60 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 17 Jul 2025 14:22:24 -0700 Subject: [PATCH] Revert "systemd: provide -dev as elogind-dev" This commit (and the one before it) seem to have broken building new images, apk hits a conflict with udevd and systemd-udevd: systemd-udevd-257.7-r1: conflicts: systemd-257.7-r1[eudev=257.7-r1] satisfies: systemd-257.7-r1[systemd-udevd=257.7-r1] systemd-257.7-r1: conflicts: systemd-udevd-257.7-r1[eudev=257.7-r1] satisfies: postmarketos-base-systemd-48-r0[systemd] systemd-journald-257.7-r1[so:libsystemd-shared-257.so] systemd-logind-257.7-r1[systemd=257.7-r1] systemd-logind-257.7-r1[so:libsystemd-shared-257.so] systemd-timesyncd-257.7-r1[systemd=257.7-r1] systemd-timesyncd-257.7-r1[so:libsystemd-shared-257.so] systemd-udevd-257.7-r1[so:libsystemd-shared-257.so] This reverts commit a6a31b3fe790d8538db927df225321fa29b3b614. Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6794 --- extra-repos/systemd/systemd/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra-repos/systemd/systemd/APKBUILD b/extra-repos/systemd/systemd/APKBUILD index 88681e226..3e0499d62 100644 --- a/extra-repos/systemd/systemd/APKBUILD +++ b/extra-repos/systemd/systemd/APKBUILD @@ -9,7 +9,7 @@ pkgname=systemd pkgver=257.7 _pkgver="musl-v${pkgver//_/-}-split-usr" -pkgrel=1 +pkgrel=2 pkgdesc="System and service manager" url="https://github.com/systemd/systemd" # ppc64le and s390x blocked by pmboostrap not supporting @@ -432,7 +432,7 @@ x11() { } dev() { - provides="eudev-dev udev-dev elogind-dev systemd-stage0-dev=$pkgver-r$pkgrel" + provides="eudev-dev udev-dev systemd-stage0-dev=$pkgver-r$pkgrel" provider_priority=100 default_dev