wok-next diff virtualbox-ose/receipt @ rev 14054

virtualbox-ose: splitted in virtualbox-ose for slitaz hosts and virtualbox-ose-guestutils for slitaz guests, can't get it to work without reboot
author ernia <monghitri@aruba.it>
date Tue Feb 19 20:23:53 2013 +0000 (2013-02-19)
parents bc7e7bf309a8
children 309205710b88
line diff
     1.1 --- a/virtualbox-ose/receipt	Sat Feb 16 21:14:52 2013 +0000
     1.2 +++ b/virtualbox-ose/receipt	Tue Feb 19 20:23:53 2013 +0000
     1.3 @@ -7,7 +7,7 @@
     1.4  MAINTAINER="slaxemulator@gmail.com"
     1.5  SOURCE="VirtualBox"
     1.6  TARBALL="$SOURCE-$VERSION.tar.bz2"
     1.7 -WEB_SITE="http://virtualbox.org/"
     1.8 +WEB_SITE="https://www.virtualbox.org/"
     1.9  WGET_URL="http://download.virtualbox.org/virtualbox/$VERSION/$TARBALL"
    1.10  PROVIDE="virtualbox"
    1.11  
    1.12 @@ -38,20 +38,20 @@
    1.13  	kmk all
    1.14  
    1.15  	# build modules. NOTE: we gor ERROR even if it build and cook will exit
    1.16 -	# sed ERROR to error.
    1.17 +	# so we redirect some output to avoid cooker thinking something is wrong
    1.18  	#cd 
    1.19  	KERN_DIR=/usr/src/linux make -C "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
    1.20  	# build guest additions modules
    1.21  	KERN_DIR=/usr/src/linux make -C "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
    1.22  	KERN_DIR=/usr/src/linux make -C \
    1.23  		"$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" \
    1.24 -		2>&1 | sed s'/ERROR/error/'
    1.25 +		2>&1 /dev/null
    1.26  }
    1.27  
    1.28  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.29  genpkg_rules()
    1.30  {
    1.31 -	fs=$WOK/$PACKAGE/taz/$PACKAGE-$VERSION/fs
    1.32 +	#fs=$WOK/$PACKAGE/taz/$PACKAGE-$VERSION/fs
    1.33  
    1.34  	source $src/env.sh
    1.35  	cd $src/out/linux.$BUILD_PLATFORM_ARCH/release/bin
    1.36 @@ -134,54 +134,53 @@
    1.37  	install -D -m644 vboxdrv.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxdrv.ko"
    1.38  	install -D -m644 vboxnetflt.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxnetflt.ko"
    1.39  	install -D -m644 vboxnetadp.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxnetadp.ko"
    1.40 -	#install -D -m644 vboxpci.ko "$fs/lib/modules/$KBASEVER-slitaz/misc/vboxpci.ko"
    1.41  
    1.42 -	# virtualbox-ose-additions
    1.43 +	## virtualbox-ose-additions
    1.44  
    1.45 -	cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
    1.46 -	mkdir -p $fs/usr/bin
    1.47 -	mkdir -p $fs/sbin
    1.48 -	mkdir -p $fs/etc/X11/xorg.conf.d
    1.49 +	#cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
    1.50 +	#mkdir -p $fs/usr/bin
    1.51 +	#mkdir -p $fs/sbin
    1.52 +	#mkdir -p $fs/etc/X11/xorg.conf.d
    1.53  
    1.54 -	install -m755 VBoxClient VBoxControl VBoxService "$fs/usr/bin"
    1.55 -	install -m755 mount.vboxsf "$fs/sbin"
    1.56 +	#install -m755 VBoxClient VBoxControl VBoxService "$fs/usr/bin"
    1.57 +	#install -m755 mount.vboxsf "$fs/sbin"
    1.58  
    1.59 -	[ -f $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf ] &&
    1.60 -	install -m644 $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
    1.61 -		$fs/etc/X11/xorg.conf.d/50-vboxmouse.conf
    1.62 +	#[ -f $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf ] &&
    1.63 +	#install -m644 $src/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
    1.64 +		#$fs/etc/X11/xorg.conf.d/50-vboxmouse.conf
    1.65  
    1.66 -	install -m755 -D $src/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
    1.67 -		$fs/usr/bin/VBoxClient-all
    1.68 -	install -m755 -D $src/src/VBox/Additions/x11/Installer/vboxclient.desktop \
    1.69 -		$fs/etc/xdg/autostart/vboxclient.desktop
    1.70 +	#install -m755 -D $src/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
    1.71 +		#$fs/usr/bin/VBoxClient-all
    1.72 +	#install -m755 -D $src/src/VBox/Additions/x11/Installer/vboxclient.desktop \
    1.73 +		#$fs/etc/xdg/autostart/vboxclient.desktop
    1.74  
    1.75 -	#install -D vboxmouse_drv_19.so \
    1.76 -	#	"$fs/usr/lib/X11/modules/input/vboxmouse.so"
    1.77 -	[ -f vboxvideo_drv_19.so ] &&
    1.78 -	install -D vboxvideo_drv_19.so \
    1.79 -		"$fs/usr/lib/X11/modules/drivers/vboxvideo.so"
    1.80 -	install -d "$fs/usr/lib/dri"
    1.81 -	install -m755 VBoxOGL*.so "$fs/usr/lib"
    1.82 -	ln -s /usr/lib/VBoxOGL.so "$fs/usr/lib/dri/vboxvideo_dri.so"
    1.83 -	install -m755 -D pam_vbox.so "$fs/lib/security/pam_vbox.so"
    1.84 +	##install -D vboxmouse_drv_19.so \
    1.85 +	##	"$fs/usr/lib/X11/modules/input/vboxmouse.so"
    1.86 +	#[ -f vboxvideo_drv_19.so ] &&
    1.87 +	#install -D vboxvideo_drv_19.so \
    1.88 +		#"$fs/usr/lib/X11/modules/drivers/vboxvideo.so"
    1.89 +	#install -d "$fs/usr/lib/dri"
    1.90 +	#install -m755 VBoxOGL*.so "$fs/usr/lib"
    1.91 +	#ln -s /usr/lib/VBoxOGL.so "$fs/usr/lib/dri/vboxvideo_dri.so"
    1.92 +	#install -m755 -D pam_vbox.so "$fs/lib/security/pam_vbox.so"
    1.93  
    1.94 -	# virtualbox-ose-additions-modules
    1.95 -	cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
    1.96 +	## virtualbox-ose-additions-modules
    1.97 +	#cd "$src/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
    1.98  
    1.99 -	cd vboxguest
   1.100 -	install -D -m644 vboxguest.ko \
   1.101 -		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxguest.ko"
   1.102 +	#cd vboxguest
   1.103 +	#install -D -m644 vboxguest.ko \
   1.104 +		#"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxguest.ko"
   1.105  
   1.106 -	cd ../vboxsf
   1.107 -	install -D -m644 vboxsf.ko \
   1.108 -		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxsf.ko"
   1.109 +	#cd ../vboxsf
   1.110 +	#install -D -m644 vboxsf.ko \
   1.111 +		#"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxsf.ko"
   1.112  
   1.113 -	cd ../vboxvideo
   1.114 -	install -D -m644 vboxvideo.ko \
   1.115 -		"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxvideo.ko"
   1.116 +	#cd ../vboxvideo
   1.117 +	#install -D -m644 vboxvideo.ko \
   1.118 +		#"$fs/lib/modules/$KBASEVER-slitaz/misc/vboxvideo.ko"
   1.119  
   1.120 -	install -D -m 0644 "$stuff/60-vboxguest.rules" \
   1.121 -		"$fs/etc/udev/rules.d/60-vboxguest.rules"
   1.122 +	#install -D -m 0644 "$stuff/60-vboxguest.rules" \
   1.123 +		#"$fs/etc/udev/rules.d/60-vboxguest.rules"
   1.124  
   1.125  }
   1.126  
   1.127 @@ -189,25 +188,22 @@
   1.128  {
   1.129      #sed -i "s/vboxdrv vboxnetadp vboxnetflt vboxpci //" $1/etc/rcS.conf
   1.130      sed -i "s/vboxdrv vboxnetadp vboxnetflt //" $1/etc/rcS.conf
   1.131 -    delgroup vboxusers
   1.132 +    chroot $1/ delgroup vboxusers
   1.133  }
   1.134  
   1.135  post_install()
   1.136  {
   1.137 -	#chroot "$1/"
   1.138 -	KERNEL_VERSION=$(uname -r)
   1.139 -	depmod -a $KERNEL_VERSION
   1.140 -	#modprobe -a vboxdrv vboxnetadp vboxnetflt vboxpci
   1.141 -	modprobe -a vboxdrv vboxnetadp vboxnetflt
   1.142 -	grep -qs vboxdrv $1/etc/rcS.conf ||
   1.143 -	#sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt vboxpci /' /etc/rcS.conf
   1.144 -	sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt /' /etc/rcS.conf
   1.145 -	grep -qs vboxuser /etc/group || addgroup -g 199 vboxusers
   1.146 -	echo "add yourself to vboxusers group if you want to access host"
   1.147 -	echo "usb devices: addgroup $USER vboxusers"
   1.148 +	chroot $1/ udevadm control --reload
   1.149 +	chroot $1/ udevadm trigger
   1.150 +	KERNEL_VERSION=$( chroot $1/ uname -r) 
   1.151 +	chroot $1/ depmod -a $KERNEL_VERSION 
   1.152 +	chroot $1/ modprobe -a vboxdrv vboxnetadp vboxnetflt
   1.153 +	grep -qs vboxdrv $1/etc/rcS.conf || 	
   1.154 +		sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt /' $1/etc/rcS.conf
   1.155 +	grep -qs vboxuser $1/etc/group || chroot $1/ addgroup -g 199 vboxusers
   1.156 +	echo "add yourself to vboxusers group if you want to access"
   1.157 +	echo "host usb devices: addgroup $USER vboxusers"
   1.158 +	echo "then reboot"
   1.159 +	#i can't get udev to do its work
   1.160  	#echo "then logout and login again"
   1.161 -	echo "then reboot, until i find how to make udev do what it should without reboot..."
   1.162 -	#addgroup $USER vboxusers
   1.163 -	udevadm control --reload
   1.164 -	udevadm trigger
   1.165  }