Changeset 39322 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 16, 2011 9:46:33 AM (13 years ago)

Author:

vboxsync

Message:

linux/installers: clean up build_in_tmp (Additions side).

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (2 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -31 +31 @@
 PATH=$PATH:/bin:/sbin:/usr/sbin
 PACKAGE=VBoxGuestAdditions
-BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/vboxguest/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-BUILDVBOXSF=`/bin/ls /usr/src/vboxguest*/vboxsf/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-BUILDVBOXVIDEO=`/bin/ls /usr/src/vboxguest*/vboxvideo/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-DODKMS=`/bin/ls /usr/src/vboxguest*/do_dkms 2>/dev/null|cut -d' ' -f1`
+MODULE_SRC=`/bin/ls /usr/src/vboxguest* 2>/dev/null|cut -d' ' -f1`
+BUILDINTMP="$MODULE_SRC/build_in_tmp"
+DODKMS="$MODULE_SRC/do_dkms"
 LOG="/var/log/vboxadd-install.log"
 MODPROBE=/sbin/modprobe
@@ -383 +382 @@
 
     echo
+    begin "Building the main Guest Additions module"
+    if ! $BUILDINTMP \
+        --save-module-symvers /tmp/vboxguest-Module.symvers \
+        --module-source $MODULE_SRC/vboxguest \
+        --no-print-directory install >> $LOG 2>&1; then
+        show_error "Look at $LOG to find out what went wrong"
+        return 1
+    fi
+    succ_msg
+    begin "Building the shared folder support module"
+    if ! $BUILDINTMP \
+        --use-module-symvers /tmp/vboxguest-Module.symvers \
+        --module-source $MODULE_SRC/vboxsf \
+        --no-print-directory install >> $LOG 2>&1; then
+        show_error  "Look at $LOG to find out what went wrong"
+        return 1
+    fi
+    succ_msg
     if expr `uname -r` '<' '2.6.27' > /dev/null; then
         echo "Not building the VirtualBox advanced graphics driver as this Linux version is"
         echo "too old to use it."
-        BUILDVBOXVIDEO=
-    fi
-    if [ -n "$BUILDVBOXGUEST" ]; then
-        begin "Building the main Guest Additions module"
-        if ! $BUILDVBOXGUEST \
-            --save-module-symvers /tmp/vboxguest-Module.symvers \
-            --no-print-directory install >> $LOG 2>&1; then
-            show_error "Look at $LOG to find out what went wrong"
-            return 1
-        fi
-        succ_msg
-    fi
-    if [ -n "$BUILDVBOXSF" ]; then
-        begin "Building the shared folder support module"
-        if ! $BUILDVBOXSF \
+    else
+        begin "Building the OpenGL support module"
+        if ! $BUILDINTMP \
             --use-module-symvers /tmp/vboxguest-Module.symvers \
-            --no-print-directory install >> $LOG 2>&1; then
-            show_error  "Look at $LOG to find out what went wrong"
-            return 1
-        fi
-        succ_msg
-    fi
-    if [ -n "$BUILDVBOXVIDEO" ]; then
-        begin "Building the OpenGL support module"
-        if ! $BUILDVBOXVIDEO \
-            --use-module-symvers /tmp/vboxguest-Module.symvers \
+            --module-source $MODULE_SRC/vboxvideo \
             --no-print-directory install >> $LOG 2>&1; then
             show_error "Look at $LOG to find out what went wrong"