systemd/systemd-stage0: provide pc:libsystemd
See the comment in the APKBUILD for the details. Closes #4156 Tweak by Oliver: set provider_priority=1 explicitly, so the CI script passes. systemd proper has provider_priority=100 for the dev() subpackage. Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8711>
This commit is contained in:
parent
cb7bce13df
commit
759d6c6701
2 changed files with 21 additions and 2 deletions
|
|
@ -6,7 +6,7 @@ pkgname=systemd-stage0
|
|||
pkgver=261_rc2
|
||||
_pkgver="${pkgver/_/-}"
|
||||
# pkgrel must match systemd!
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Minimal systemd bootstrap package"
|
||||
url="https://github.com/systemd/systemd"
|
||||
# armhf: pmb#2618
|
||||
|
|
@ -103,6 +103,25 @@ build() {
|
|||
meson compile ${JOBS:+-j ${JOBS}} -C build
|
||||
}
|
||||
|
||||
dev() {
|
||||
default_dev
|
||||
|
||||
# Since we set !tracedeps, we must explicitly list things we want this
|
||||
# package to provide. We mainly need systemd-stage0 to build dbus, which
|
||||
# we then use to build the "real" systemd. We do not want to re-compile
|
||||
# dbus afterwards, dbus-dev should pull in libsystemd.
|
||||
# If we don't explicitly provide pc:libsystemd here, building dbus
|
||||
# against systemd-stage0 would result in the following abuild log:
|
||||
# "Could not find any provider for pc:libsystemd>=209"
|
||||
# and dbus-dev would not depend on libsystemd.
|
||||
# If systemd-stage0-dev provides pc:libsystemd, this is solved and
|
||||
# dbus-dev correctly depends on pc:libsystemd. And yes, this is only
|
||||
# necessary because of !tracedeps.
|
||||
# See pma#4156 for the bootstrap issue this solves.
|
||||
provides="$provides pc:libsystemd=${pkgver%%[._]*}"
|
||||
provider_priority=1
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" meson install --no-rebuild -C build
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ pkgname=systemd
|
|||
pkgver=261_rc2
|
||||
_pkgver="${pkgver/_/-}"
|
||||
# pkgrel must match systemd-stage0!
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="System and service manager"
|
||||
url="https://github.com/systemd/systemd"
|
||||
# armhf: no linux-stable
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue