tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

dbus: added runit service.

Browse Source
This commit is contained in:
Juan RP 2014-10-13 13:43:12 +02:00
parent ba75b74a5b
commit fc44d1f8f1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcpkgs/dbus/files/dbus/run Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
dbus-uuidgen --ensure
exec dbus-daemon --system --nofork --nopidfile

10
srcpkgs/dbus/template
View File

@ -2,7 +2,7 @@
# #
pkgname=dbus pkgname=dbus
version=1.8.8 version=1.8.8
revision=1 revision=2
short_desc="Message bus system" short_desc="Message bus system"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"
@ -14,6 +14,7 @@ create_wrksrc=yes
hostmakedepends="pkg-config intltool gperf xmlto" hostmakedepends="pkg-config intltool gperf xmlto"
makedepends="expat-devel libX11-devel libcap-devel" makedepends="expat-devel libX11-devel libcap-devel"
conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
replaces="runit-void<20141013_2"
# Create dbus:22 system account. # Create dbus:22 system account.
system_accounts="dbus:22" system_accounts="dbus:22"
@ -46,7 +47,6 @@ _dbus_bootstrap() {
make ${makejobs} make ${makejobs}
make install make install
} }
_systemd_bootstrap() { _systemd_bootstrap() {
# Build a temporary systemd; we are only interested in libsystemd-login. # Build a temporary systemd; we are only interested in libsystemd-login.
if [ ! -d ${wrksrc}/systemd-bootstrap ]; then if [ ! -d ${wrksrc}/systemd-bootstrap ]; then
@ -88,7 +88,6 @@ _systemd_bootstrap() {
cp -a ${wrksrc}/systemd-install/usr/lib/pkgconfig/libsystemd* \ cp -a ${wrksrc}/systemd-install/usr/lib/pkgconfig/libsystemd* \
${_systemddir}/lib/pkgconfig/ ${_systemddir}/lib/pkgconfig/
} }
pre_configure() { pre_configure() {
if [ "$build_option_systemd" ]; then if [ "$build_option_systemd" ]; then
if [ ! -f ${wrksrc}/dbus_bootstrap_done ]; then if [ ! -f ${wrksrc}/dbus_bootstrap_done ]; then
@ -101,7 +100,6 @@ pre_configure() {
fi fi
fi fi
} }
do_configure() { do_configure() {
cd ${wrksrc}/dbus-${version} cd ${wrksrc}/dbus-${version}
@ -129,7 +127,6 @@ do_build() {
cd ${wrksrc}/dbus-${version} cd ${wrksrc}/dbus-${version}
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
cd ${wrksrc}/dbus-${version} cd ${wrksrc}/dbus-${version}
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install
@ -140,6 +137,7 @@ do_install() {
rm -rf ${_systemddir}/include/systemd rm -rf ${_systemddir}/include/systemd
rm -f ${_systemddir}/lib/libsystemd-* rm -f ${_systemddir}/lib/libsystemd-*
fi fi
vsv dbus
} }
dbus-devel_package() { dbus-devel_package() {
@ -153,14 +151,12 @@ dbus-devel_package() {
vmove usr/share/doc vmove usr/share/doc
} }
} }
dbus-libs_package() { dbus-libs_package() {
short_desc+=" - shared libraries" short_desc+=" - shared libraries"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so.*" vmove "usr/lib/*.so.*"
} }
} }
dbus-x11_package() { dbus-x11_package() {
replaces="dbus<1.4.16_2" replaces="dbus<1.4.16_2"
short_desc+=" - X11 support" short_desc+=" - X11 support"