From f6be22a665ff141af9ce5ded1950f3ddf4d5d056 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 21 Feb 2014 23:02:15 -0500
Subject: [PATCH] Update KVM and add qemu

---
 config/packages-list       |  2 +-
 stage5/hv-install-1        |  4 +++-
 stage5/misc/kvm-udev.rules |  1 +
 stage5/packages-update     |  2 +-
 stage5/pkg/qemu            | 14 ++++++++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 stage5/misc/kvm-udev.rules
 create mode 100644 stage5/pkg/qemu

diff --git a/config/packages-list b/config/packages-list
index f7f1c00..2642ed0 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -196,7 +196,6 @@ KERBEROS5="krb5-1.10.3"
 KERNEL="linux-3.14.4"
 KEYUTILS="keyutils-1.5.5"
 KMOD="kmod-13"
-KVM="kvm-88"
 
 LADSPA="ladspa_sdk"
 LAME="lame-3.99.5"
@@ -344,6 +343,7 @@ PYGOBJECT="pygobject-2.28.6"
 PYGTK="pygtk-2.24.0"
 PYTHON="Python-2.7.3"
 
+QEMU="qemu-1.7.0"
 QT="qt-everywhere-opensource-src-4.8.5"
 
 RALENTI="ralenti-0.1"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index b355514..24b0cbd 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -250,7 +250,9 @@ if [ "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LTSP_UTILS}
 fi
 
-ipkg -m acnb ${KVM}
+ipkg -j ${QEMU} "--libexecdir=/usr/lib/qemu \
+    --docdir=/usr/share/doc/qemu-1.7.0 \
+    --target-list=x86_64-softmmu"
 ipkg -m acnb ${BRIDGE_UTILS}
 ipkg -m noac ${TUNCTL}
 
diff --git a/stage5/misc/kvm-udev.rules b/stage5/misc/kvm-udev.rules
new file mode 100644
index 0000000..481cfcf
--- /dev/null
+++ b/stage5/misc/kvm-udev.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", NAME="%k", GROUP="kvm", MODE="0660"
diff --git a/stage5/packages-update b/stage5/packages-update
index 31cdc73..b1a8c17 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -185,7 +185,7 @@ fpkg -m gnu ${INDENT}
 
 fpkg -e "tgz" ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
 fpkg -s "software/network/tftp/tftp-hpa" ${TFTP_HPA} ${KERNEL_URL}
-fpkg -m sf ${KVM}
+fpkg ${QEMU} "http://wiki.qemu-project.org/download"
 fpkg -m sf -s "bridge" ${BRIDGE_UTILS}
 fpkg -m sf ${TUNCTL}
 
diff --git a/stage5/pkg/qemu b/stage5/pkg/qemu
new file mode 100644
index 0000000..1c8cd52
--- /dev/null
+++ b/stage5/pkg/qemu
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    [ -e  /usr/lib/libcacard.so ] && chmod -v 755 /usr/lib/libcacard.so
+
+    hv_groupadd kvm
+
+    usermod -a -G kvm ${REGUSER}
+
+    # Add a Udev rule so that the KVM device gets correct permissions:
+    install -v -m644 ${SCRDIR}/misc/kvm-udev.rules  \
+        /lib/udev/rules.d/65-kvm.rules
+}
-- 
2.20.1