Changeset 24402 in vbox

Timestamp:

Nov 5, 2009 5:11:02 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: more fixes

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (1 diff)
• installer/vboxadd.sh (modified) (6 diffs)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -412 +412 @@
         $(QUIET)tar --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \
                 -C $(VBOX_LNX_ADD_INST_OUT_DIR) \
-                $(subst $(VBOX_LNX_ADD_INST_OUT_DIR)/,,$(VBOX_LNX_ADD_ARCH_FILES))
+                bin debug init lib sbin share src
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
         $(QUIET)tar --owner 0 --group 0 -cjRf $@ \
                 -C $(VBOX_LNX_ADD_INST_OUT_DIR) \
-                $(subst $(VBOX_LNX_ADD_INST_OUT_DIR)/,,$(VBOX_LNX_ADD_ARCH_FILES))
+                bin debug init lib sbin share src
 endif
         $(QUIET)$(CHMOD) 0644 $@

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

@@ -34 +34 @@
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
+PACKAGE=VBoxGuestAdditions
 BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
 BUILDVBOXVFS=`/bin/ls /usr/src/vboxvfs*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
@@ -172 +173 @@
 start()
 {
-    begin "Starting VirtualBox Additions ";
+    begin "Starting the VirtualBox Guest Additions ";
     running_vboxguest || {
         rm -f $dev || {
@@ -284 +285 @@
 {
     # don't stop the old modules here -- they might be in use
+    if find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|grep -q vboxvideo; then
+        begin "Removing old VirtualBox vboxvideo kernel module"
+        find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+        succ_msg
+    fi
     if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then
         begin "Removing old VirtualBox vboxvfs kernel module"
@@ -294 +300 @@
         succ_msg
     fi
-    echo "Building VirtualBox kernel modules"
+    begin "Building the VirtualBox kernel modules"
+    if ! sh /usr/share/$PACKAGE/test/build_in_tmp \
+        --no-print-directory > $LOG 2>&1; then
+        fail "`printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong"`"
+    fi
+    echo
+    if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
+        --no-print-directory > $LOG 2>&1; then
+        printf "Your system does not seem to support OpenGL in the kernel (this requires\nLinux 2.6.27 or later).  The OpenGL support will not be built.\n"
+        BUILDVBOXVIDEO=""
+    fi
     begin "Building the main VirtualBox module"
     if ! $BUILDVBOXGUEST \
@@ -357 +373 @@
 
     # Put mount.vboxsf in the right place
-    ln -s /usr/lib/VBoxGuestAdditions/mount.vboxsf /sbin
+    ln -s /usr/lib/$PACKAGE/mount.vboxsf /sbin
 
     succ_msg
@@ -395 +411 @@
     # Remove other files
     rm /sbin/mount.vboxsf 2>/dev/null
+    rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
 }