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

Timestamp:

Nov 17, 2011 10:25:36 PM (13 years ago)

Author:

vboxsync

Message:

Installers/linux: make do_dkms take arguments instead of requiring patching.

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• installer/vboxadd.sh (modified) (7 diffs)

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

@@ -58 +58 @@
 VBOX_PATH_LNX_INST_SRC            := $(PATH_ROOT)/src/VBox/Installer/linux/
 VBOX_REL_LNX_INST_SRC             := $(subst $(PATH_ROOT)/src/VBox, ../..,$(VBOX_PATH_LNX_INST_SRC))
+VBOX_PATH_LNX_HOST_DRV            := $(PATH_ROOT)/src/VBox/HostDrivers/linux/
+VBOX_REL_LNX_HOST_DRV             := $(subst $(PATH_ROOT)/src/VBox, ../..,$(VBOX_PATH_LNX_HOST_DRV))
 
 # Unset this to speed up things during makefile hacking.
@@ -339 +341 @@
         $(VBOX_REL_LNX_ADD_INST)deffiles
 LnxAdd-scripts_EXEC_SOURCES  = \
+        $(VBOX_REL_LNX_HOST_DRV)do_dkms \
         $(VBOX_REL_LNX_INST_SRC)routines.sh \
         $(VBOX_REL_LNX_ADD_INST)vboxadd.sh=>vboxadd \

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

@@ -29 +29 @@
 ### END INIT INFO
 
-. /var/lib/VBoxGuestAdditions/config
-export BUILD_TYPE
-export USERNAME
-
 PATH=$PATH:/bin:/sbin:/usr/sbin
 PACKAGE=VBoxGuestAdditions
-OLDMODULES="vboxguest vboxadd vboxsf vboxvfs vboxvideo"
-MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
-BUILDINTMP="$MODULE_SRC/build_in_tmp"
-DODKMS="$MODULE_SRC/do_dkms"
 LOG="/var/log/vboxadd-install.log"
 MODPROBE=/sbin/modprobe
+OLDMODULES="vboxguest vboxadd vboxsf vboxvfs vboxvideo"
 
 if $MODPROBE -c | grep -q '^allow_unsupported_modules  *0'; then
@@ -168 +161 @@
 fi
 
+show_error()
+{
+    if [ "$system" = "gentoo" ]; then
+        eerror $1
+    fi
+    fail_msg
+    echo "($1)"
+}
+
+fail()
+{
+    show_error "$1"
+    exit 1
+}
+
 dev=/dev/vboxguest
 userdev=/dev/vboxuser
+config=/var/lib/VBoxGuestAdditions/config
 owner=vboxadd
 group=1
@@ -199 +208 @@
         printf "The missing package can be probably installed with\napt-get install linux-headers-$KERN_VER\n"
     fi
-}
-
-show_error()
-{
-    if [ "$system" = "gentoo" ]; then
-        eerror $1
-    fi
-    fail_msg
-    echo "($1)"
-}
-
-fail()
-{
-    show_error "$1"
-    exit 1
 }
 
@@ -355 +349 @@
 {
     begin "Removing existing VirtualBox DKMS kernel modules"
-    $DODKMS uninstall > $LOG
+    $DODKMS uninstall $OLDMODULES > $LOG
     succ_msg
     begin "Removing existing VirtualBox non-DKMS kernel modules"
@@ -372 +366 @@
 
     # Short cut out if a dkms build succeeds
-    if $DODKMS install >> $LOG 2>&1; then
+    if $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
         succ_msg
         return 0
@@ -483 +477 @@
 setup()
 {
+    if test -r $config; then
+      . $config
+    else
+      fail "Configuration file $config not found"
+    fi
+    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+      fail "Configuration file $config not complete"
+    export BUILD_TYPE
+    export USERNAME
+
+    MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
+    BUILDINTMP="$MODULE_SRC/build_in_tmp"
+    DODKMS="$MODULE_SRC/do_dkms"
+
     setup_modules
     mod_succ="$?"
@@ -498 +506 @@
 cleanup()
 {
+    if test -r $config; then
+      . $config
+      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+        fail "Configuration file $config not complete"
+      DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
+    elif test -x ./do_dkms; then  # Executing as part of the installer...
+      DODKMS=./do_dkms
+    else
+      fail "Configuration file $config not found"
+    fi
+
     # Delete old versions of VBox modules.
     cleanup_modules