From 3b663223cc926cdd7db130f2a1efaae9a042ab6d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 13 Oct 2014 16:34:02 +0200 Subject: [PATCH] virtualbox-ose-guest: added runit service. --- srcpkgs/virtualbox-ose/files/vboxservice/run | 2 ++ srcpkgs/virtualbox-ose/template | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100755 srcpkgs/virtualbox-ose/files/vboxservice/run diff --git a/srcpkgs/virtualbox-ose/files/vboxservice/run b/srcpkgs/virtualbox-ose/files/vboxservice/run new file mode 100755 index 00000000000..6332cc9f13a --- /dev/null +++ b/srcpkgs/virtualbox-ose/files/vboxservice/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec VBoxService -f diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index dbccad5e7df..9ba33940f03 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -2,7 +2,7 @@ pkgname=virtualbox-ose _vbox_distver=4.3.18 version=${_vbox_distver} -revision=3 +revision=4 wrksrc="VirtualBox-${version}" patch_args="-Np1" short_desc="General-purpose full virtualizer for x86 hardware" @@ -28,6 +28,7 @@ fi depends="virtualbox-ose-dkms-${version}_${revision} hicolor-icon-theme desktop-file-utils" system_groups="vboxusers" +build_options="systemd" pre_configure() { # Use our path for dri drivers. @@ -39,17 +40,14 @@ pre_configure() { sed -i 's/^check_gcc$/#check_gcc/' configure } - do_configure() { ./configure --disable-docs --disable-java --enable-vde \ --disable-python --disable-kmods --nofatal } - do_build() { source ./env.sh kmk ${makejobs} all } - do_install() { local f _osedir _guestdir @@ -135,10 +133,9 @@ virtualbox-ose-dkms_package() { usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules } } - virtualbox-ose-guest_package() { lib32disabled=yes - systemd_services="vboxservice.service on" + replaces="runit-void<20141013_2" depends="xserver-abi-video-18_1 virtualbox-ose-guest-dkms-${version}_${revision}" short_desc+=" - guest utilities" @@ -165,10 +162,12 @@ virtualbox-ose-guest_package() { install -Dm755 pam_vbox.so ${PKGDESTDIR}/usr/lib/security/pam_vbox.so vinstall ${FILESDIR}/virtualbox-guest.conf 644 usr/lib/modules-load.d - vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system + fi + vsv vboxservice } } - virtualbox-ose-guest-dkms_package() { short_desc+=" - guest addition module source for dkms" dkms_modules="virtualbox-ose-guest ${_vbox_distver}"