[PC-BSD Commits] r21134 - in pbi/modules/emulators: . qemu-devel qemu-devel/scripts

[svn at pcbsd.org]

Author: kenmoore
Date: 2013-01-25 13:03:34 +0000 (Fri, 25 Jan 2013)
New Revision: 21134

Added:
   pbi/modules/emulators/qemu-devel/
Removed:
   pbi/modules/emulators/qemu-devel/scripts/pre-install.sh
Modified:
   pbi/modules/emulators/qemu-devel/pbi.conf
   pbi/modules/emulators/qemu-devel/scripts/post-install.sh
Log:
Add a copy of qemu for qemu/devel, just removing the kqemu kernel stuff because it does not exist for the -devel version



Modified: pbi/modules/emulators/qemu-devel/pbi.conf
===================================================================
--- pbi/modules/emulators/qemu/pbi.conf	2013-01-25 10:22:40 UTC (rev 21133)
+++ pbi/modules/emulators/qemu-devel/pbi.conf	2013-01-25 13:03:34 UTC (rev 21134)
@@ -10,7 +10,7 @@
 PBI_PROGNAME="QEMU"
  
 # Program Website
-PBI_PROGWEB="http://fabrice.bellard.free.fr/qemu/"
+PBI_PROGWEB="http://wiki.qemu.org/Main_Page"
  
 # Program Author / Vendor
 PBI_PROGAUTHOR="Fabrice Bellard"
@@ -19,10 +19,10 @@
 PBI_PROGICON="aqemu.png"
  
 # The target port we are building
-PBI_MAKEPORT="emulators/qemu"
+PBI_MAKEPORT="emulators/qemu-devel"
  
 # Additional options for make.conf
-PBI_MAKEOPTS="qemu_SET= KQEMU"
+PBI_MAKEOPTS=""
  
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
@@ -30,7 +30,7 @@
 
 PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
 
-PBI_BUILDKEY="05"; export PBI_BUILDKEY
+PBI_BUILDKEY="01"; export PBI_BUILDKEY
 
 # PBI_PROGREVISION="01"; export PBI_PROGREVISION
  

Modified: pbi/modules/emulators/qemu-devel/scripts/post-install.sh
===================================================================
--- pbi/modules/emulators/qemu/scripts/post-install.sh	2013-01-25 10:22:40 UTC (rev 21133)
+++ pbi/modules/emulators/qemu-devel/scripts/post-install.sh	2013-01-25 13:03:34 UTC (rev 21134)
@@ -1,13 +1,10 @@
 #!/bin/sh
 
 
-ln -s ${PBI_PROGDIRPATH}/modules/kqemu.ko /boot/modules/kqemu.ko
-kldload /boot/modules/kqemu.ko
 kldload /boot/kernel/aio.ko
 
 cp /boot/loader.conf /boot/loader.conf.orig
-cat /boot/loader.conf | grep -v "kqemu_load" | grep -v "aio_load" > /tmp/loader.conf
-echo 'kqemu_load="YES"' >> /tmp/loader.conf
+cat /boot/loader.conf | grep -v "aio_load" > /tmp/loader.conf
 echo 'aio_load="YES"' >> /tmp/loader.conf
 mv /tmp/loader.conf /boot/loader.conf