Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "systemd: provide -dev as elogind-dev"

Browse source 
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 a6a31b3fe7.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6794
This commit is contained in:
Clayton Craft 2025-07-17 14:22:24 -07:00
parent f10fb45ae5
commit 44688263bd
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extra-repos/systemd/systemd/APKBUILD
View file

@ -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