# HG changeset patch
# User ernia <monghitri@aruba.it>
# Date 1361454021 0
# Node ID 309205710b8813ce04c47ab4af167fb0e41c4f0c
# Parent  fa5913a0fdf3b5119c2cc249c268a036dca6c362
Virtualbox-ose: trying to fix

diff -r fa5913a0fdf3 -r 309205710b88 virtualbox-ose-guestutils/receipt
--- a/virtualbox-ose-guestutils/receipt	Thu Feb 21 11:14:44 2013 +0100
+++ b/virtualbox-ose-guestutils/receipt	Thu Feb 21 13:40:21 2013 +0000
@@ -29,9 +29,7 @@
 	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 \
+	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"
@@ -44,7 +42,6 @@
 	#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
@@ -64,42 +61,47 @@
 		
 	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
+    if chroot $1/ lspci | grep -qi virtualbox; then
+		sed -i "s/vboxguest vboxsf vboxvideo //" $1/etc/rcS.conf
+		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
+    fi
 }
 
 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"
+	if chroot $1/ lspci | grep -qi virtualbox; then
+		#chroot $1/ udevadm control --reload
+		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
+		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"
+		#i can't get udev to do its work
+		#echo "then logout and login again"
+		#chroot $1/ /etc/init.d/VBoxService start &> /dev/null
+		echo "then reboot"
+	else
+		echo "this is not a virtual machine," 
+		echo "i'm useless here and you probably" 
+		echo "may want to remove me." 
+	fi
 }
diff -r fa5913a0fdf3 -r 309205710b88 virtualbox-ose/receipt
--- a/virtualbox-ose/receipt	Thu Feb 21 11:14:44 2013 +0100
+++ b/virtualbox-ose/receipt	Thu Feb 21 13:40:21 2013 +0000
@@ -24,8 +24,6 @@
 compile_rules()
 {
 	cd $src
-	#patch -Np1 -i "$stuff/virtualbox-4-makeself-check.patch"
-	#patch -Np1 -i "$stuff/virtualbox-4-mkisofs-check.patch"
 	cp $stuff/LocalConfig.kmk .
 	./configure \
 		--disable-pulse \
@@ -37,22 +35,15 @@
 	source ./env.sh
 	kmk all
 
-	# build modules. NOTE: we gor ERROR even if it build and cook will exit
-	# so we redirect some output to avoid cooker thinking something is wrong
-	#cd 
+	# build modules.
 	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 /dev/null
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	#fs=$WOK/$PACKAGE/taz/$PACKAGE-$VERSION/fs
-
 	source $src/env.sh
 	cd $src/out/linux.$BUILD_PLATFORM_ARCH/release/bin
 	mkdir -p $fs/usr/bin $fs/usr/lib/virtualbox/components \
@@ -107,8 +98,6 @@
 	echo 'INSTALL_DIR=/usr/lib/virtualbox' >> "$fs/etc/vbox/vbox.cfg"
 
 	#udev
-	#install -D -m 0644 "$stuff/60-virtualbox.rules" \
-	#"$fs/etc/udev/rules.d/60-virtualbox.rules"
 	install -D -m 0644 "$stuff/10-vboxdrv.rules" \
 	"$fs/etc/udev/rules.d/10-vboxdrv.rules"
 
@@ -123,78 +112,25 @@
 	chmod 644 $fs/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/client/*.py
 	cd $src/out/linux.$BUILD_PLATFORM_ARCH/release/bin
 
-	
-	
 	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/src"
 	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"
-
-	## 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
-
-	#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
-
-	#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"
-
-	## 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 ../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"
-
 }
 
 pre_remove()
 {
-    #sed -i "s/vboxdrv vboxnetadp vboxnetflt vboxpci //" $1/etc/rcS.conf
     sed -i "s/vboxdrv vboxnetadp vboxnetflt //" $1/etc/rcS.conf
     chroot $1/ delgroup vboxusers
 }
 
 post_install()
 {
-	chroot $1/ udevadm control --reload
-	chroot $1/ udevadm trigger
+	#chroot $1/ udevadm control --reload
 	KERNEL_VERSION=$( chroot $1/ uname -r) 
 	chroot $1/ depmod -a $KERNEL_VERSION 
 	chroot $1/ modprobe -a vboxdrv vboxnetadp vboxnetflt
@@ -203,7 +139,7 @@
 	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"
 }