From a375ff04510e4e854c1e6ad7115c7d5f9c17b6c4 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 19 Mar 2025 15:42:00 -0700 Subject: [PATCH] systemd/systemd: move udevadm into udev subpkg Fixes a conflict between systemd and systemd-udev where apk thinks they both provide cmd:udevadm: ERROR: unable to select packages: systemd-256.11-r2: conflicts: systemd-udevd-256.11-r2[cmd:udevadm=256.11-r2] systemd-udevd-256.11-r2: conflicts: systemd-256.11-r2[cmd:udevadm=256.11-r2] [ci:ignore-count] [ci:skip-build] already built in CI Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6334 --- extra-repos/systemd/systemd/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra-repos/systemd/systemd/APKBUILD b/extra-repos/systemd/systemd/APKBUILD index 1f21d4e4c..b01223e54 100644 --- a/extra-repos/systemd/systemd/APKBUILD +++ b/extra-repos/systemd/systemd/APKBUILD @@ -6,7 +6,7 @@ pkgname=systemd # currently tracking git MR pkgver=256.11 _pkgver="musl-v${pkgver//_/-}-split-usr" -pkgrel=2 +pkgrel=3 pkgdesc="System and service manager" url="https://github.com/systemd/systemd" arch="all !ppc64le !s390x" # blocked by pmboostrap not supporting @@ -259,6 +259,7 @@ udevd() { provider_priority=100 amove etc/udev + amove usr/bin/udevadm amove usr/lib/libudev* amove usr/lib/systemd/system/initrd-udevadm-cleanup-db.service amove usr/lib/systemd/system/sockets.target.wants/systemd-udev*