diff options
Diffstat (limited to 'nonsystemd')
| -rw-r--r-- | nonsystemd/elogind/PKGBUILD | 56 | ||||
| -rw-r--r-- | nonsystemd/elogind/elogind.sv.initd | 12 |
2 files changed, 25 insertions, 43 deletions
diff --git a/nonsystemd/elogind/PKGBUILD b/nonsystemd/elogind/PKGBUILD index cf3e8cf0f..1669f9da5 100644 --- a/nonsystemd/elogind/PKGBUILD +++ b/nonsystemd/elogind/PKGBUILD @@ -1,20 +1,10 @@ -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Maintainer: David P. <megver83@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@parabola.nu> # Maintainer (Artix): artoo <artoo@artixlinux.org> -# This package comes from Artix -# Parabola changes: -# - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous -# - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it, -# so in that way it will provide the correct version according to the -# architecture (libsystemd.so=0-64 or libsystemd.so=0-32) -# - remove prepare() - pkgbase=elogind pkgname=('elogind' 'libelogind') pkgver=246.10 -pkgrel=2 +pkgrel=7 pkgdesc="The systemd project's logind, extracted to a standalone package" arch=('x86_64') arch+=('i686' 'armv7h') @@ -24,10 +14,17 @@ makedepends=('acl' 'intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus' 'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap') options=('!libtool') source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz" - #'elogind.confd' 'elogind.initd' - 'elogind.sv.initd') + dbus-exit.patch::https://github.com/pierre-labastie/elogind/commit/04d76bc0f087640bedc6ee52525529ccfdc6ae78.patch + fix-p-opt.patch::https://github.com/njhanley/elogind/commit/850797eaf482d7f1ada051730eeeca53676ca43e.patch) sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922' - 'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b') + 'cccbbe6bf6603d81c307ad670994fe058ff630b37c218041c4ca877ef0486843' + '5d39f9d9edd6fb0e9e93bae004ca47bb0973c7570c8dd840f98cda3348bddd7f') + +prepare() { + cd ${pkgbase}-${pkgver} + patch -Np 1 -i ../dbus-exit.patch + patch -Np 1 -i ../fix-p-opt.patch +} build() { local meson_options=( @@ -43,7 +40,7 @@ build() { arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}" - ninja -C build + meson compile -C build } check(){ @@ -52,14 +49,14 @@ check(){ package_elogind() { pkgdesc="The systemd project's logind, extracted to a standalone package" - provides=("systemd=${pkgver}" 'logind') + provides=('logind') depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev') optdepends=('polkit: polkit support') backup=('etc/elogind/logind.conf') - provides+=("${pkgname}-openrc") - conflicts=('systemd-udev' "${pkgname}-openrc") - replaces=("${pkgname}-openrc") + # systemd compatibility + provides+=("systemd=$pkgver") + conflicts+=('systemd') DESTDIR="$pkgdir" meson install -C build @@ -69,29 +66,26 @@ package_elogind() { mv -v "${pkgdir}"/usr/lib/libelogind*.so* "${srcdir}"/_libelogind install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d - - # Init script - #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind - #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind - install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind - - install -d "${pkgdir}"/etc/runlevels/boot - ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind } package_libelogind(){ pkgdesc="elogind client libraries" provides=('libelogind.so' 'liblogind') - provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}" - 'libsystemd.so') - conflicts=('libsystemd.so') depends=('libcap' 'libudev') + # libsystemd compatibility + provides+=('libsystemd.so' "libsystemd=${pkgver}" "systemd-libs=${pkgver}") + conflicts+=('libsystemd.so' 'libsystemd' 'systemd-libs') + cd "${pkgbase}-${pkgver}" install -dm755 "${pkgdir}"/usr/lib mv "${srcdir}"/_libelogind/libelogind*.so* "${pkgdir}"/usr/lib - install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so + #ln -sfv libelogind.so "${pkgdir}"/usr/lib/libsystemd.so ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0 + + # libsystemd compatibility + # HACK: (re)install libelogind.so as libsystemd.so so their lib versions match + install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so } diff --git a/nonsystemd/elogind/elogind.sv.initd b/nonsystemd/elogind/elogind.sv.initd deleted file mode 100644 index 79194b2bb..000000000 --- a/nonsystemd/elogind/elogind.sv.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 2021 Artix Linux -# Distributed under the terms of the GNU General Public License v2 - -supervisor=supervise-daemon -command="/usr/lib/elogind/elogind" - -depend() { - need dbus - provide logind - before xdm -} |