diff options
Diffstat (limited to 'system')
4 files changed, 23 insertions, 97 deletions
diff --git a/system/virtualbox-ose-addons/doinst.sh b/system/virtualbox-ose-addons/doinst.sh index 6b419160bc..a19270331f 100644 --- a/system/virtualbox-ose-addons/doinst.sh +++ b/system/virtualbox-ose-addons/doinst.sh @@ -1,5 +1,3 @@ -#!/bin/sh - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -14,7 +12,7 @@ config() { } # Prepare the new configuration files -for file in etc/rc.d/rc.vboxadd.new etc/rc.d/rc.vboxvfs.new etc/rc.d/rc.vboxadd-timesync.new; do +for file in etc/rc.d/rc.vboxadd.new etc/rc.d/rc.vboxadd-timesync.new; do if [ -e $(dirname $file)/$(basename $file .new) -a -x $(dirname $file)/$(basename $file .new) ]; then chmod 0755 $file else diff --git a/system/virtualbox-ose-addons/vboxadd-timesync.diff b/system/virtualbox-ose-addons/vboxadd-timesync.diff deleted file mode 100644 index b2b930c108..0000000000 --- a/system/virtualbox-ose-addons/vboxadd-timesync.diff +++ /dev/null @@ -1,69 +0,0 @@ -#The MIT License -# -#Copyright (c) 2008 Heinz Wiesinger -# -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in -#all copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -#THE SOFTWARE. ---- vboxadd-timesync.sh 2008-06-25 20:09:33.000000000 +0200 -+++ vboxadd-timesync.sh.new 2008-09-24 22:17:54.941071664 +0200 -@@ -45,6 +45,9 @@ - elif [ -f /etc/gentoo-release ]; then - system=gentoo - PIDFILE="/var/run/vboxadd-timesync" -+elif [ -f /etc/slackware-version ]; then -+ system=slackware -+ PIDFILE="/var/run/vboxadd-timesync" - else - system=other - if [ -d /var/run -a -w /var/run ]; then -@@ -123,6 +126,35 @@ - fi - fi - -+if [ "$system" = "slackware" ]; then -+ daemon() { -+ $1 $2 -+ } -+ -+ killproc() { -+ killall $1 -+ rm -f $PIDFILE -+ } -+ -+ fail_msg() { -+ echo " ...fail!" -+ } -+ -+ succ_msg() { -+ echo " ...done." -+ } -+ -+ status() { -+ echo -n "Checking for vboxadd-timesync" -+ if [ -f /var/run/$1 ]; then -+ echo " ...running" -+ else -+ echo " ...not running" -+ fi -+ } -+ -+fi -+ - if [ "$system" = "other" ]; then - fail_msg() { - echo " ...fail!" diff --git a/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild b/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild index 33ec6ad4ff..fd89237eae 100644 --- a/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild +++ b/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-ose-addons -# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at> +# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,9 @@ PRGNAM=virtualbox-ose-addons SRCNAM=VirtualBox -VERSION=2.0.6 +VERSION=2.1.4 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -35,9 +35,8 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if ! grep ^vboxadd: /etc/passwd 2>&1 > /dev/null; then - echo " Must have a vboxadd user to run this script." - echo " # useradd -d /var/run/vboxadd -g 1 -s /bin/sh vboxadd" - echo " Or something similar." + echo " You must have a vboxadd user to run this script." + echo " # useradd -u 215 -d /var/run/vboxadd -g 1 -s /bin/sh vboxadd" exit 1 fi @@ -57,21 +56,21 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-${VERSION}-OSE.tar.bz2 -cd $SRCNAM-$VERSION +rm -rf $SRCNAM-${VERSION}_OSE +tar xvf $CWD/$SRCNAM-${VERSION}-3-OSE.tar.bz2 +cd $SRCNAM-${VERSION}_OSE chown -R root:root . chmod -R u+w,go+r-w,a-s . -#We set the environment variables manually to avoid dependency on dev86 and acpica +# We set the environment variables manually to avoid dependency on dev86 and acpica export BUILD_PLATFORM="linux" export BUILD_PLATFORM_ARCH="x86" export BUILD_TARGET="linux" export BUILD_TARGET_ARCH="x86" export BUILD_TARGET_CPU="$ARCH" export BUILD_TYPE="release" -export PATH_KBUILD="$TMP/$SRCNAM-$VERSION/kBuild" -export PATH_DEVTOOLS="$TMP/$SRCNAM-$VERSION/tools" +export PATH_KBUILD="$TMP/$SRCNAM-${VERSION}_OSE/kBuild" +export PATH_DEVTOOLS="$TMP/$SRCNAM-${VERSION}_OSE/tools" path_kbuild_bin="$PATH_KBUILD/bin/$BUILD_TARGET.$BUILD_PLATFORM_ARCH" export PATH_KBUILD_BIN="$path_kbuild_bin" path_dev_bin="$PATH_DEVTOOLS/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"/bin @@ -82,15 +81,13 @@ unset path_kbuild_bin path_dev_bin kmk -j ${JOBS} LOCALCFG=$CWD/LocalConfig.kmk -mkdir -p $PKG/usr/{src,bin,sbin,share/autostart} \ - $PKG/etc/{xdg/autostart,udev/rules.d,rc.d} \ - $PKG/usr/lib/xorg/modules/{drivers,input} - -# Patch vboxadd-timesync.sh to support Slackware -patch -d src/VBox/Additions/linux/installer -i $CWD/vboxadd-timesync.diff +mkdir -p $PKG/sbin \ + $PKG/usr/{src,bin,sbin,share/autostart} \ + $PKG/etc/{xdg/autostart,rc.d} \ + $PKG/usr/lib/xorg/modules/{drivers,input} \ + $PKG/lib/udev/rules.d cp -f src/VBox/Additions/linux/installer/vboxadd.sh $PKG/etc/rc.d/rc.vboxadd.new -cp -f src/VBox/Additions/linux/installer/vboxvfs.sh $PKG/etc/rc.d/rc.vboxvfs.new cp -f src/VBox/Additions/linux/installer/vboxadd-timesync.sh $PKG/etc/rc.d/rc.vboxadd-timesync.new cp -f src/VBox/Additions/x11/installer/vboxclient.desktop $PKG/etc/xdg/autostart/ @@ -98,7 +95,7 @@ cp -f src/VBox/Additions/x11/installer/vboxclient.desktop $PKG/usr/share/autosta install -m 755 src/VBox/Additions/x11/installer/VBoxRandR.sh $PKG/usr/bin/VBoxRandR echo "KERNEL==\"vboxadd\", NAME=\"vboxadd\", OWNER=\"vboxadd\", MODE=\"0660\"" \ - > $PKG/etc/udev/rules.d/60-vboxadd.rules + > $PKG/lib/udev/rules.d/60-vboxadd.rules cd out/linux.x86/release/bin/additions cp -rf src/vboxadd $PKG/usr/src/vboxadd-$VERSION @@ -106,7 +103,7 @@ cd out/linux.x86/release/bin/additions install -m 755 VBoxControl $PKG/usr/bin/ install -m 755 VBoxClient $PKG/usr/bin/ install -m 755 vboxadd-timesync $PKG/usr/sbin/ - install -m 4755 mountvboxsf $PKG/usr/sbin/mount.vboxsf + install -m 4755 mountvboxsf $PKG/sbin/mount.vboxsf install -m 644 vboxvideo_drv_14.so $PKG/usr/lib/xorg/modules/drivers/vboxvideo_drv.so install -m 644 vboxmouse_drv_14.so $PKG/usr/lib/xorg/modules/input/vboxmouse_drv.so diff --git a/system/virtualbox-ose-addons/virtualbox-ose-addons.info b/system/virtualbox-ose-addons/virtualbox-ose-addons.info index bbec98e930..ddfa3d83a6 100644 --- a/system/virtualbox-ose-addons/virtualbox-ose-addons.info +++ b/system/virtualbox-ose-addons/virtualbox-ose-addons.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-ose-addons" -VERSION="2.0.6" +VERSION="2.1.4" HOMEPAGE="http://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/2.0.6/VirtualBox-2.0.6-OSE.tar.bz2" -MD5SUM="455253532b5128bb5c2ff4c76b9751a7" +DOWNLOAD="http://download.virtualbox.org/virtualbox/2.1.4/VirtualBox-2.1.4-3-OSE.tar.bz2" +MD5SUM="54548336d61b33e2a01b210b314927cd" MAINTAINER="ppr:kut" EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero" +APPROVED="dsomero,rworkman" |