[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:/lunar-linux/moonbase-other

[stumbles]

commit 568601068789181d1f3abcca820d0783f7f792f8
Author: stumbles <stumbles at lunar-linux.org>
Date: Sat, 02 Feb 2013 02:39:06 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/568601068789181d1f3abcca820d0783f7f792f8

Merge branch 'master' of github.com:/lunar-linux/moonbase-other
---
  virtual/qemu/BUILD     | +15/-5    
  virtual/qemu/CONFIGURE | +2/-0     
  2 files changed, 17 insertions(+), 5 deletions(-)

--- a/virtual/qemu/BUILD
+++ b/virtual/qemu/BUILD
@@ -1,12 +1,19 @@
 (
-  unset CFLAGS
 
-  OPTS+=" --extra-ldflags=-L/usr/X11R6/lib"
   OPTS+=" --target-list=$(echo $TARGETLIST | sed s/\ /,/g)"
 
+  AUDIO_LIST="oss"
+
+  in_depends $MODULE alsa-lib && AUDIO_LIST+=",alsa"
+  in_depends $MODULE esound && AUDIO_LIST+=",esd"
+  in_depends $MODULE pulseaudio && AUDIO_LIST+=",pa"
+  in_depends $MODULE SDL && AUDIO_LIST+=",sdl"
+
+  add_priv_group kvm &&
+
   ./configure --prefix=/usr  \
               --sysconfdir=/etc  \
-              --audio-drv-list=oss,alsa,sdl  \
+              --audio-drv-list="$AUDIO_LIST"  \
               --audio-card-list=ac97,sb16,es1370,hda  \
               --enable-mixemu  \
               $OPTS  &&
@@ -16,8 +23,11 @@
 # bridge_helper needs suid
   chmod u+s "/usr/libexec/qemu-bridge-helper"  &&
 
-  mkdir -p /usr/lib/udev/rules.d  &&
-  install -m644 $SCRIPT_DIRECTORY/65-kvm.rules /usr/lib/udev/rules.d/65-kvm.rules  &&
+  if module_installed systemd; then
+    install -D -m644 $SCRIPT_DIRECTORY/65-kvm.rules /usr/lib/udev/rules.d/65-kvm.rules
+  else
+    install -D -m644 $SCRIPT_DIRECTORY/65-kvm.rules /lib/udev/rules.d/65-kvm.rules
+  fi &&
 
   # qemu-doc.html may not exist, but it will be ignored if that is the case
   gather_docs TODO qemu-doc.html
--- a/virtual/qemu/CONFIGURE
+++ b/virtual/qemu/CONFIGURE
@@ -37,3 +37,5 @@ if ! grep -q CONFIGURED $MODULE_CONFIG; then
   echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
   echo "CONFIGURED=y"          >> $MODULE_CONFIG
 fi
+
+mquery ENABLE_KVM "Enable KVM support?" y "--enable-kvm" "--disable-kvm"