wok diff get-virtualbox/stuff/installer.u @ rev 5217

Add aria2
author Alexander Medvedev <devl547@gmail.com>
date Tue Apr 06 23:26:30 2010 +0000 (2010-04-06)
parents 7c843086474b
children 790414b3cf9a
line diff
     1.1 --- a/get-virtualbox/stuff/installer.u	Wed Jan 13 14:53:32 2010 +0100
     1.2 +++ b/get-virtualbox/stuff/installer.u	Tue Apr 06 23:26:30 2010 +0000
     1.3 @@ -1,24 +1,15 @@
     1.4  --- stuff/get-virtualbox	Thu Jan  7 14:12:34 2010
     1.5 -+++ get-virtualbox	Wed Jan 13 14:50:44 2010
     1.6 -@@ -24,7 +24,8 @@
     1.7 -    	 grep Linux_x86.run | sed 's|.*href="\(.*Linux_x86.run\).*|\1|'
     1.8 - }
     1.9 - 
    1.10 --TMP_DIR=/tmp/get-$PACKAGE-$$-$RANDOM
    1.11 -+TMP_DIR=/home/slitaz/src/get-$PACKAGE-$$-$RANDOM
    1.12 ++++ get-virtualbox	Fri Jan 15 11:39:10 2010
    1.13 +@@ -57,6 +57,159 @@
    1.14 + cd install 
    1.15 + [ -d /usr/share/VirtualBox ] && ./uninstall.sh
    1.16 + find /usr /etc /lib > ../before
    1.17  +
    1.18 - CUR_DIR=$(pwd)
    1.19 - mkdir -p $TMP_DIR && cd $TMP_DIR
    1.20 - 
    1.21 -@@ -55,6 +56,145 @@
    1.22 - 
    1.23 - # Install files
    1.24 - cd install 
    1.25  +
    1.26  +# Add Slitaz support to VirtualBox installer.
    1.27 -+patch -p1 <<'EOT'
    1.28 +++patch -p1 <<'EOT'
    1.29  +--- install-ori/routines.sh	Thu Dec 17 14:37:35 2009
    1.30 -++++ install/routines.sh	Thu Dec 24 00:17:33 2009
    1.31 +++++ install/routines.sh	Thu Dec 24 13:33:02 2009
    1.32  +@@ -207,6 +207,10 @@
    1.33  +         ro_SYS_TYPE=unknown
    1.34  +         ro_INIT_TYPE=bsd
    1.35 @@ -35,8 +26,8 @@
    1.36  +         chmod 755 "/usr/sbin/$name" 2> /dev/null
    1.37  +         hav register $name System.Service $pardus_script
    1.38  ++    elif [ "$ro_INIT_TYPE" = "slitaz" ]; then
    1.39 -++        cp "$script" "/etc/rc.d/init.d/$name" 2> /dev/null
    1.40 -++        chmod 755 "/etc/rc.d/init.d/$name" 2> /dev/null
    1.41 +++        cp "$script" "/etc/init.d/$name" 2> /dev/null
    1.42 +++        chmod 755 "/etc/init.d/$name" 2> /dev/null
    1.43  +     else
    1.44  +         log "install_init_script: error: unknown init type"
    1.45  +         return 1
    1.46 @@ -45,7 +36,7 @@
    1.47  +         hav remove $name
    1.48  +         rm -f "/usr/sbin/$name" > /dev/null 2>&1
    1.49  ++	elif [ "$ro_INIT_TYPE" = "slitaz" ]; then
    1.50 -++        rm -f "/etc/rc.d/init.d/$name" > /dev/null 2>&1
    1.51 +++        rm -f "/etc/init.d/$name" > /dev/null 2>&1
    1.52  +     else
    1.53  +         log "remove_init_script: error: unknown init type"
    1.54  +         return 1
    1.55 @@ -54,7 +45,7 @@
    1.56  +     elif [ "$ro_INIT_TYPE" = "lfs" ]; then
    1.57  +         "/etc/rc.d/init.d/$name" start >> $ro_LOG_FILE 2>&1
    1.58  ++    elif [ "$ro_INIT_TYPE" = "slitaz" ]; then
    1.59 -++        "/etc/rc.d/init.d/$name" start >> $ro_LOG_FILE 2>&1
    1.60 +++        "/etc/init.d/$name" start >> $ro_LOG_FILE 2>&1
    1.61  +     elif [ "$ro_INIT_TYPE" = "pardus" ]; then
    1.62  +         service $name on
    1.63  +     else
    1.64 @@ -63,7 +54,7 @@
    1.65  +     elif [ "$ro_INIT_TYPE" = "lfs" ]; then
    1.66  +         "/etc/rc.d/init.d/$name" stop >> $ro_LOG_FILE 2>&1
    1.67  ++    elif [ "$ro_INIT_TYPE" = "slitaz" ]; then
    1.68 -++        "/etc/rc.d/init.d/$name" stop >> $ro_LOG_FILE 2>&1
    1.69 +++        "/etc/init.d/$name" stop >> $ro_LOG_FILE 2>&1
    1.70  +     elif [ "$ro_INIT_TYPE" = "pardus" ]; then
    1.71  +         service $name off
    1.72  +     else
    1.73 @@ -112,7 +103,7 @@
    1.74  +         log "$self: error: unknown init type"
    1.75  +         return 1
    1.76  +--- install-ori/vboxdrv.sh	Thu Dec 17 14:37:35 2009
    1.77 -++++ install/vboxdrv.sh	Wed Dec 23 23:01:14 2009
    1.78 +++++ install/vboxdrv.sh	Thu Dec 24 11:49:30 2009
    1.79  +@@ -63,6 +63,8 @@
    1.80  +         system=suse
    1.81  +     elif [ -f /etc/gentoo-release ]; then
    1.82 @@ -150,29 +141,34 @@
    1.83  +     if [ "$system" != "gentoo" ]; then
    1.84  +         begin_msg() {
    1.85  +             [ -z "${1:-}" ] && return 1
    1.86 ++@@ -169,7 +185,11 @@
    1.87 ++         if ! modprobe vboxdrv > /dev/null 2>&1; then
    1.88 ++             failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
    1.89 ++         fi
    1.90 ++-        sleep .2
    1.91 +++        if [ "$system" = "slitaz" ]; then
    1.92 +++			sleep 1
    1.93 +++		else
    1.94 +++			sleep .2
    1.95 +++		fi
    1.96 ++     fi
    1.97 ++     # ensure the character special exists
    1.98 ++     if [ ! -c $DEVICE ]; then
    1.99 ++
   1.100  +EOT
   1.101  +
   1.102 -+
   1.103 - [ -d /usr/share/VirtualBox ] && ./uninstall.sh
   1.104 - find /usr /etc /lib > ../before
   1.105   ./install.sh install /usr/share/VirtualBox 
   1.106 -@@ -76,12 +216,18 @@
   1.107 - CATEGORY="non-free"
   1.108 - SHORT_DESC="$SHORT_DESC"
   1.109 - WEB_SITE="$WEB_SITE"
   1.110 --DEPENDS="libsdl fontconfig gcc-lib-base glib libpng python udev"
   1.111 -+DEPENDS="libsdl fontconfig gcc-lib-base glib libpng python udev libglu-mesa"
   1.112 - 
   1.113 - post_install()
   1.114 + cd ..
   1.115 + find /usr /etc /lib > after
   1.116 +@@ -82,6 +235,11 @@
   1.117   {
   1.118   $(grep '  udev[atp]' install/install.sh)
   1.119       chroot "\$1/" depmod -a $(uname -r)
   1.120 -+}
   1.121 -+
   1.122 -+post_remove()
   1.123 -+{
   1.124 -+		/etc/init.d/vboxdrv stop
   1.125 -+		sed -i 's/vboxdrv//' /etc/rcS.conf
   1.126 ++    
   1.127 ++	# Add vboxusers group
   1.128 ++	if (! grep -q ^vboxusers /etc/group); then
   1.129 ++		addgroup vboxusers
   1.130 ++	fi
   1.131   }
   1.132   EOT
   1.133