From 8e357db3fdbe4a6597f56d22410a724cbda4db0b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 15 Oct 2014 18:44:38 +0200
Subject: [PATCH] xen: fix runit services; remove unnecessary rdeps.

---
 srcpkgs/xen/files/xen/run         | 2 +-
 srcpkgs/xen/files/xenconsoled/run | 1 +
 srcpkgs/xen/files/xenstored/run   | 5 +++--
 srcpkgs/xen/template              | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xen/files/xen/run b/srcpkgs/xen/files/xen/run
index 8e6c60b2a5..b35a945d1b 100755
--- a/srcpkgs/xen/files/xen/run
+++ b/srcpkgs/xen/files/xen/run
@@ -1,5 +1,5 @@
 #!/bin/sh
-sv check xenstored >/dev/null || exit 1
+sv check xenconsoled >/dev/null || exit 1
 xenstore-write "/local/domain/0/domid" 0 || exit 1
 xenstore-write "/local/domain/0/name" "Domain-0" || exit 1
 exec chpst -b xen pause
diff --git a/srcpkgs/xen/files/xenconsoled/run b/srcpkgs/xen/files/xenconsoled/run
index c26b31bc1f..bf13989cdb 100755
--- a/srcpkgs/xen/files/xenconsoled/run
+++ b/srcpkgs/xen/files/xenconsoled/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check xenstored >/dev/null || exit 1
+mkdir -p /var/log/xen/console
 exec xenconsoled -i --log=all
diff --git a/srcpkgs/xen/files/xenstored/run b/srcpkgs/xen/files/xenstored/run
index 8f750a536a..f30d9adefa 100755
--- a/srcpkgs/xen/files/xenstored/run
+++ b/srcpkgs/xen/files/xenstored/run
@@ -1,6 +1,7 @@
 #!/bin/sh
 [ ! -d /run/xen ] && mkdir -p /run/xen
-mount -t xenfs xenfs /proc/xen || exit 1
-mount -t tmpfs xenstored /var/lib/xenstored || exit 1
+modprobe -q xen-evtchn xen-gnttalloc || exit 1
+mountpoint -q /proc/xen || mount -t xenfs xenfs /proc/xen
+mountpoint -q /var/lib/xenstored || mount -t tmpfs xenstored /var/lib/xenstored
 grep -q control_d /proc/xen/capabilities || exit 1
 exec xenstored --verbose --no-fork
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index d4b3787793..be8f6bf59a 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -2,7 +2,7 @@
 pkgname=xen
 version=4.4.1
 wrksrc=xen-${version}
-revision=4
+revision=5
 short_desc="The Xen hypervisor utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
@@ -18,7 +18,7 @@ makedepends="
  libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
  ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel
  dev86 acpica-utils pixman-devel gcc-multilib"
-depends="iproute2 bridge-utils xen-hypervisor"
+depends="xen-hypervisor"
 replaces="runit-void<20141013_2"
 
 build_options="systemd"