# HG changeset patch
# User ernia <monghitri@aruba.it>
# Date 1361305433 0
# Node ID 315d0dde6e3ae9f07bb6714bc75064ac6b9109f8
# Parent  6107d922d4f6cf62afed71618d16872a320929d1
virtualbox-ose: splitted in virtualbox-ose for slitaz hosts and virtualbox-ose-guestutils for slitaz guests, can't get it to work without reboot

diff -r 6107d922d4f6 -r 315d0dde6e3a virtualbox-ose-guestutils/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualbox-ose-guestutils/receipt	Tue Feb 19 20:23:53 2013 +0000
@@ -0,0 +1,105 @@
+# SliTaz package receipt.
+
+PACKAGE="virtualbox-ose-guestutils"
+VERSION="4.2.6"
+CATEGORY="misc"
+SHORT_DESC="VirtualBox Guest userspace utilities, useful for running Slitaz inside a virtual machine"
+MAINTAINER="slaxemulator@gmail.com"
+WANTED="virtualbox-ose"
+WEB_SITE="https://www.virtualbox.org/"
+DEPENDS="xorg-libXfixes xorg-libXmu xorg-xrandr"
+BUILD_DEPENDS=""
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	# virtualbox-ose-additions
+	source $src/env.sh
+	cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+	mkdir -p $fs/usr/bin
+	mkdir -p $fs/sbin
+	mkdir -p $fs/etc/X11/xorg.conf.d
+	mkdir -p $fs/etc/init.d
+
+	install -m755 VBoxClient VBoxControl VBoxService "$fs/usr/bin"
+	install -m755 mount.vboxsf "$fs/sbin"
+
+	install -m755 -D $src/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+		$fs/usr/bin/VBoxClient-all
+	install -m755 -D $src/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+		$fs/etc/xdg/autostart/vboxclient.desktop
+
+	install -D vboxmouse_drv_16.so \
+		"$fs/usr/lib/X11/modules/input/vboxmouse.so"
+		install -D vboxvideo_drv_112.so \
+		"$fs/usr/lib/X11/modules/drivers/vboxvideo.so"
+	install -d "$fs/usr/lib/dri"
+	install -m755 VBoxOGL*.so "$fs/usr/lib"
+	ln -s /usr/lib/VBoxOGL.so "$fs/usr/lib/dri/vboxvideo_dri.so"
+	install -m755 -D pam_vbox.so "$fs/lib/security/pam_vbox.so"
+
+	# virtualbox-ose-additions-modules
+
+	KERNEL_VERSION=$(grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g')
+	#cooking installs modules in linux major version dir
+	KBASEVER="${KERNEL_VERSION:0:3}"
+
+
+	cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+
+	cd vboxguest
+	install -D -m644 vboxguest.ko \
+		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxguest.ko"
+
+	cd ../vboxsf
+	install -D -m644 vboxsf.ko \
+		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxsf.ko"
+
+	cd ../vboxvideo
+	install -D -m644 vboxvideo.ko \
+		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxvideo.ko"
+
+	install -D -m 0644 "$stuff/60-vboxguest.rules" \
+		"$fs/etc/udev/rules.d/60-vboxguest.rules"
+		
+	install -D -m 0755 "$stuff/VBoxService" \
+		"$fs/etc/init.d/VBoxService"
+
+}
+
+pre_remove()
+{
+    sed -i "s/vboxguest vboxsf vboxvideo //" $1/etc/rcS.conf
+    chroot $1/ /etc/init.d/VBoxService stop
+    sed -i '/# VBoxService daemon options./{N;N;N;d}' $1/etc/daemons.conf
+    sed -i 's/VBoxService //' $1/etc/rcS.conf
+    chroot $1/ delgroup vboxsf
+    sed -i 's/^\tDriver.*$/\tDriver      "vesa"/' $1/etc/X11/xorg.conf.d/60-Device.conf
+}
+
+post_install()
+{
+	chroot $1/ udevadm control --reload
+	chroot $1/ udevadm trigger
+	grep -qs VBOXSERVICE_OPTIONS $1/etc/daemons.conf || 
+		cat >> $1/etc/daemons.conf << "EOT"
+# VBoxService daemon options.
+VBOXSERVICE_OPTIONS=""
+
+EOT
+	KERNEL_VERSION=$( chroot $1/ uname -r) 
+	chroot $1/ depmod -a $KERNEL_VERSION 
+	#chroot $1/ modprobe -a vboxguest vboxsf vboxvideo
+	sed -i 's/^\tDriver.*$/\tDriver      "vboxvideo"/' $1/etc/X11/xorg.conf.d/60-Device.conf
+	grep -qs vboxguest $1/etc/rcS.conf || 	
+		sed -i 's/LOAD_MODULES="/&vboxguest vboxsf vboxvideo /' $1/etc/rcS.conf
+	grep -qs VBoxService $1/etc/rcS.conf ||
+		sed -i 's/RUN_DAEMONS="/&VBoxService /' $1/etc/rcS.conf
+	grep -qs vboxsf $1/etc/group || chroot $1/ addgroup -g 109 vboxsf
+	echo "add yourself to vboxsf group if you want to access"
+	echo "host shared folder: addgroup $USER vboxsf"
+	echo "then reboot"
+	#i can't get udev to do its work
+	#echo "then logout and login again"
+	#chroot $1/ /etc/init.d/VBoxService start &> /dev/null
+}
diff -r 6107d922d4f6 -r 315d0dde6e3a virtualbox-ose-guestutils/stuff/60-vboxguest.rules
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualbox-ose-guestutils/stuff/60-vboxguest.rules	Tue Feb 19 20:23:53 2013 +0000
@@ -0,0 +1,2 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff -r 6107d922d4f6 -r 315d0dde6e3a virtualbox-ose-guestutils/stuff/VBoxService
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualbox-ose-guestutils/stuff/VBoxService	Tue Feb 19 20:23:53 2013 +0000
@@ -0,0 +1,52 @@
+#!/bin/sh
+# /etc/init.d/VBoxService: Start, stop and restart VBoxService daemon on SliTaz,
+# at boot time or with the command line. Daemons options are configured
+# with /etc/daemons.conf
+#
+. /etc/init.d/rc.functions
+. /etc/daemons.conf
+
+NAME=VBoxService
+DESC="VirtualBox Guest Service"
+DAEMON=/usr/bin/VBoxService
+OPTIONS=$VBOXSERVICE_OPTIONS
+PIDFILE=/var/run/VBoxService.pid
+
+case "$1" in
+	start)
+		if active_pidfile $PIDFILE VBoxService ; then
+			echo "$NAME already running."
+			exit 1
+		fi
+		echo -n "Starting $DESC: $NAME... "
+		mkdir -p $(dirname $PIDFILE)
+		$DAEMON $OPTIONS
+		status ;;
+	stop)
+		if ! active_pidfile $PIDFILE VBoxService ; then
+			echo "$NAME is not running."
+			exit 1
+		fi
+		echo -n "Stopping $DESC: $NAME... "
+		kill $(cat $PIDFILE)
+		rm $PIDFILE
+		status ;;
+	restart)
+		if ! active_pidfile $PIDFILE VBoxService ; then
+			echo "$NAME is not running."
+			exit 1
+		fi
+		echo -n "Restarting $DESC: $NAME... "
+		kill $(cat $PIDFILE)
+		rm $PIDFILE
+		sleep 2
+		$DAEMON $OPTIONS
+		status ;;
+	*)
+		echo ""
+		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
+		echo ""
+		exit 1 ;;
+esac
+
+exit 0
diff -r 6107d922d4f6 -r 315d0dde6e3a virtualbox-ose/receipt
--- a/virtualbox-ose/receipt	Tue Feb 19 18:35:30 2013 +0100
+++ b/virtualbox-ose/receipt	Tue Feb 19 20:23:53 2013 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 SOURCE="VirtualBox"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://virtualbox.org/"
+WEB_SITE="https://www.virtualbox.org/"
 WGET_URL="http://download.virtualbox.org/virtualbox/$VERSION/$TARBALL"
 PROVIDE="virtualbox"
 
@@ -38,20 +38,20 @@
 	kmk all
 
 	# build modules. NOTE: we gor ERROR even if it build and cook will exit
-	# sed ERROR to error.
+	# so we redirect some output to avoid cooker thinking something is wrong
 	#cd 
 	KERN_DIR=/usr/src/linux make -C "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
 	# build guest additions modules
 	KERN_DIR=/usr/src/linux make -C "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
 	KERN_DIR=/usr/src/linux make -C \
 		"$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" \
-		2>&1 | sed s'/ERROR/error/'
+		2>&1 /dev/null
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	fs=$WOK/$PACKAGE/taz/$PACKAGE-$VERSION/fs
+	#fs=$WOK/$PACKAGE/taz/$PACKAGE-$VERSION/fs
 
 	source $src/env.sh
 	cd $src/out/linux.$BUILD_PLATFORM_ARCH/release/bin
@@ -134,54 +134,53 @@
 	install -D -m644 vboxdrv.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxdrv.ko"
 	install -D -m644 vboxnetflt.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxnetflt.ko"
 	install -D -m644 vboxnetadp.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxnetadp.ko"
-	#install -D -m644 vboxpci.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxpci.ko"
 
-	# virtualbox-ose-additions
+	## virtualbox-ose-additions
 
-	cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-	mkdir -p $fs/usr/bin
-	mkdir -p $fs/sbin
-	mkdir -p $fs/etc/X11/xorg.conf.d
+	#cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+	#mkdir -p $fs/usr/bin
+	#mkdir -p $fs/sbin
+	#mkdir -p $fs/etc/X11/xorg.conf.d
 
-	install -m755 VBoxClient VBoxControl VBoxService "$fs/usr/bin"
-	install -m755 mount.vboxsf "$fs/sbin"
+	#install -m755 VBoxClient VBoxControl VBoxService "$fs/usr/bin"
+	#install -m755 mount.vboxsf "$fs/sbin"
 
-	[ -f $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf ] &&
-	install -m644 $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
-		$fs/etc/X11/xorg.conf.d/50-vboxmouse.conf
+	#[ -f $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf ] &&
+	#install -m644 $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
+		#$fs/etc/X11/xorg.conf.d/50-vboxmouse.conf
 
-	install -m755 -D $src/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-		$fs/usr/bin/VBoxClient-all
-	install -m755 -D $src/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-		$fs/etc/xdg/autostart/vboxclient.desktop
+	#install -m755 -D $src/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+		#$fs/usr/bin/VBoxClient-all
+	#install -m755 -D $src/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+		#$fs/etc/xdg/autostart/vboxclient.desktop
 
-	#install -D vboxmouse_drv_19.so \
-	#	"$fs/usr/lib/X11/modules/input/vboxmouse.so"
-	[ -f vboxvideo_drv_19.so ] &&
-	install -D vboxvideo_drv_19.so \
-		"$fs/usr/lib/X11/modules/drivers/vboxvideo.so"
-	install -d "$fs/usr/lib/dri"
-	install -m755 VBoxOGL*.so "$fs/usr/lib"
-	ln -s /usr/lib/VBoxOGL.so "$fs/usr/lib/dri/vboxvideo_dri.so"
-	install -m755 -D pam_vbox.so "$fs/lib/security/pam_vbox.so"
+	##install -D vboxmouse_drv_19.so \
+	##	"$fs/usr/lib/X11/modules/input/vboxmouse.so"
+	#[ -f vboxvideo_drv_19.so ] &&
+	#install -D vboxvideo_drv_19.so \
+		#"$fs/usr/lib/X11/modules/drivers/vboxvideo.so"
+	#install -d "$fs/usr/lib/dri"
+	#install -m755 VBoxOGL*.so "$fs/usr/lib"
+	#ln -s /usr/lib/VBoxOGL.so "$fs/usr/lib/dri/vboxvideo_dri.so"
+	#install -m755 -D pam_vbox.so "$fs/lib/security/pam_vbox.so"
 
-	# virtualbox-ose-additions-modules
-	cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+	## virtualbox-ose-additions-modules
+	#cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
 
-	cd vboxguest
-	install -D -m644 vboxguest.ko \
-		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxguest.ko"
+	#cd vboxguest
+	#install -D -m644 vboxguest.ko \
+		#"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxguest.ko"
 
-	cd ../vboxsf
-	install -D -m644 vboxsf.ko \
-		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxsf.ko"
+	#cd ../vboxsf
+	#install -D -m644 vboxsf.ko \
+		#"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxsf.ko"
 
-	cd ../vboxvideo
-	install -D -m644 vboxvideo.ko \
-		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxvideo.ko"
+	#cd ../vboxvideo
+	#install -D -m644 vboxvideo.ko \
+		#"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxvideo.ko"
 
-	install -D -m 0644 "$stuff/60-vboxguest.rules" \
-		"$fs/etc/udev/rules.d/60-vboxguest.rules"
+	#install -D -m 0644 "$stuff/60-vboxguest.rules" \
+		#"$fs/etc/udev/rules.d/60-vboxguest.rules"
 
 }
 
@@ -189,25 +188,22 @@
 {
     #sed -i "s/vboxdrv vboxnetadp vboxnetflt vboxpci //" $1/etc/rcS.conf
     sed -i "s/vboxdrv vboxnetadp vboxnetflt //" $1/etc/rcS.conf
-    delgroup vboxusers
+    chroot $1/ delgroup vboxusers
 }
 
 post_install()
 {
-	#chroot "$1/"
-	KERNEL_VERSION=$(uname -r)
-	depmod -a $KERNEL_VERSION
-	#modprobe -a vboxdrv vboxnetadp vboxnetflt vboxpci
-	modprobe -a vboxdrv vboxnetadp vboxnetflt
-	grep -qs vboxdrv $1/etc/rcS.conf ||
-	#sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt vboxpci /' /etc/rcS.conf
-	sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt /' /etc/rcS.conf
-	grep -qs vboxuser /etc/group || addgroup -g 199 vboxusers
-	echo "add yourself to vboxusers group if you want to access host"
-	echo "usb devices: addgroup $USER vboxusers"
+	chroot $1/ udevadm control --reload
+	chroot $1/ udevadm trigger
+	KERNEL_VERSION=$( chroot $1/ uname -r) 
+	chroot $1/ depmod -a $KERNEL_VERSION 
+	chroot $1/ modprobe -a vboxdrv vboxnetadp vboxnetflt
+	grep -qs vboxdrv $1/etc/rcS.conf || 	
+		sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt /' $1/etc/rcS.conf
+	grep -qs vboxuser $1/etc/group || chroot $1/ addgroup -g 199 vboxusers
+	echo "add yourself to vboxusers group if you want to access"
+	echo "host usb devices: addgroup $USER vboxusers"
+	echo "then reboot"
+	#i can't get udev to do its work
 	#echo "then logout and login again"
-	echo "then reboot, until i find how to make udev do what it should without reboot..."
-	#addgroup $USER vboxusers
-	udevadm control --reload
-	udevadm trigger
 }