[PC-BSD Commits] r5712 - in pbibuild/modules/emulators/virtualbox: . kmenu-dir overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-12-29 12:34:22 -0800 (Tue, 29 Dec 2009)
New Revision: 5712

Modified:
   pbibuild/modules/emulators/virtualbox/kmenu-dir/VBoxManage
   pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/emulators/virtualbox/pbi.conf
Log:

Rebuild virtualbox, fix loading of module and add VBoxManage to CLI



Modified: pbibuild/modules/emulators/virtualbox/kmenu-dir/VBoxManage
===================================================================
--- pbibuild/modules/emulators/virtualbox/kmenu-dir/VBoxManage	2009-12-29 19:30:31 UTC (rev 5711)
+++ pbibuild/modules/emulators/virtualbox/kmenu-dir/VBoxManage	2009-12-29 20:34:22 UTC (rev 5712)
@@ -1,8 +1,8 @@
 ExePath: bin/VBoxManage
 ExeIcon: virtualbox.png
 ExeDescr: Virtual Manage
-ExeNoDesktop: 0
-ExeNoMenu: 0
+ExeNoDesktop: 1
+ExeNoMenu: 1
 ExeRunRoot: 1
 ExeRunShell: 0
 ExeNotify: 1

Modified: pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.RemoveScript.sh	2009-12-29 19:30:31 UTC (rev 5711)
+++ pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.RemoveScript.sh	2009-12-29 20:34:22 UTC (rev 5712)
@@ -15,3 +15,4 @@
 cat /boot/loader.conf | grep -v "vboxdrv_load" > /tmp/loader.conf
 mv /tmp/loader.conf /boot/loader.conf
 
+rm /Programs/bin/VBoxManage

Modified: pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.SetupScript.sh	2009-12-29 19:30:31 UTC (rev 5711)
+++ pbibuild/modules/emulators/virtualbox/overlay-dir/PBI.SetupScript.sh	2009-12-29 20:34:22 UTC (rev 5712)
@@ -13,10 +13,12 @@
 #########################################
 
 # Link the kernel module and load it and load aio as well
-ln -s /Programs/${PROGDIR}/modules/vboxdrv.ko /boot/modules/vboxdrv.ko
+cp /Programs/${PROGDIR}/modules/vboxdrv.ko /boot/modules/vboxdrv.ko
 # Don't load driver now, causes crashes in X
 #kldload /boot/modules/vboxdrv.ko
 
+ln -fs /Programs/${PROGDIR}/bin/VBoxManage /Programs/bin/VBoxManage
+
 # Save the kernel module to load at bootup
 cp /boot/loader.conf /boot/loader.conf.orig
 cat /boot/loader.conf | grep -v "vboxdrv_load"  > /tmp/loader.conf

Modified: pbibuild/modules/emulators/virtualbox/pbi.conf
===================================================================
--- pbibuild/modules/emulators/virtualbox/pbi.conf	2009-12-29 19:30:31 UTC (rev 5711)
+++ pbibuild/modules/emulators/virtualbox/pbi.conf	2009-12-29 20:34:22 UTC (rev 5712)
@@ -35,7 +35,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="19"
 
 # By default we prune the python files used for building,
 # Set this to NO to keep any python files in the resulting PBI