Changeset 32183 in vbox for trunk/src/VBox/Installer/linux/rpm

Timestamp:

Sep 1, 2010 3:53:42 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65467

Message:

Linux Installer/Additions: attempt to properly register the host/guest kernel modules at DKMS and use the setup function of the service script to compile the modules instead of doing this separately in the installer scripts

File:

• trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (5 diffs)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec ¶

@@ -135 +135 @@
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxHeadless
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxwebsrv
-ln -s /usr/share/virtualbox/src/vboxdrv $RPM_BUILD_ROOT/usr/src/vboxdrv-%VER%
-ln -s /usr/share/virtualbox/src/vboxnetflt $RPM_BUILD_ROOT/usr/src/vboxnetflt-%VER%
-ln -s /usr/share/virtualbox/src/vboxnetadp $RPM_BUILD_ROOT/usr/src/vboxnetadp-%VER%
+ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
 mv virtualbox.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualbox.desktop
 mv VBox.png $RPM_BUILD_ROOT/usr/share/pixmaps/VBox.png
@@ -267 +265 @@
 %endif
 
-# try to build a kernel module (disable with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox)
-REGISTER_DKMS=1
+# Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
+BUILD_MODULES=0
 if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko -a "$INSTALL_NO_VBOXDRV" != "1" ]; then
   # compile problem
@@ -276 +274 @@
 
 EOF
-  rm -f /etc/vbox/module_not_compiled
-  echo "** Compiling vboxdrv" > /var/log/vbox-install.log
-  if ! /usr/share/virtualbox/src/vboxdrv/build_in_tmp \
-    --save-module-symvers /tmp/vboxdrv-Module.symvers \
-    --no-print-directory KBUILD_VERBOSE= \
-    install >> /var/log/vbox-install.log 2>&1; then
-    cat << EOF
-Compilation of the kernel module FAILED! VirtualBox will not start until this
-problem is fixed. Please consult $LOG to find out why the
-kernel module does not compile. Most probably the kernel sources are not found.
-Install them and execute
-
-  /etc/init.d/vboxdrv setup
-
-as root.
-
-EOF
-    touch /etc/vbox/module_not_compiled
-  else
-    echo "** Compiling vboxnetflt" >> /var/log/vbox-install.log
-    if ! /usr/share/virtualbox/src/vboxnetflt/build_in_tmp \
-      --use-module-symvers /tmp/vboxdrv-Module.symvers \
-      --no-print-directory KBUILD_VERBOSE= \
-      install >> /var/log/vbox-install.log 2>&1; then
-      cat << EOF
-Compilation of the kernel module FAILED! VirtualBox will not start until this
-problem is fixed. Please consult $LOG to find out why the
-kernel module does not compile. Most probably the kernel sources are not found.
-Install them and execute
-
-  /etc/init.d/vboxdrv setup
-
-as root.
-
-EOF
-      touch /etc/vbox/module_not_compiled
-    else
-      echo "** Compiling vboxnetadp" >> /var/log/vbox-install.log
-      if ! /usr/share/virtualbox/src/vboxnetadp/build_in_tmp \
-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
-        --no-print-directory KBUILD_VERBOSE= \
-        install >> /var/log/vbox-install.log 2>&1; then
-        cat << EOF
-Compilation of the kernel module FAILED! VirtualBox will not start until this
-problem is fixed. Please consult $LOG to find out why the
-kernel module does not compile. Most probably the kernel sources are not found.
-Install them and execute
-
-  /etc/init.d/vboxdrv setup
-
-as root.
-
-EOF
-        touch /etc/vbox/module_not_compiled
-      fi
-    fi
-  fi
-  rm -f /tmp/vboxdrv-Module.symvers
-  if [ ! -f /etc/vbox/module_not_compiled ]; then
-    cat << EOF
-Success!
-
-EOF
-    REGISTER_DKMS=
-  fi
-fi
-# Register at DKMS. If the modules were built above, they are already registered
-if [ -n "$REGISTER_DKMS" ]; then
-  DKMS=`which dkms 2>/dev/null`
-  if [ -n "$DKMS" ]; then
-    for m in vboxdrv vboxnetflt vboxnetadp; do
-      $DKMS status -m $m | while read line; do
-        if echo "$line" | grep -q added > /dev/null ||
-           echo "$line" | grep -q built > /dev/null ||
-           echo "$line" | grep -q installed > /dev/null; then
-             v=`echo "$line" | sed "s/$m,\([^,]*\)[,:].*/\1/;t;d"`
-             $DKMS remove -m $m -v $v --all > /dev/null 2>&1
-        fi
-      done
-      $DKMS add -m $m -v %VER% > /dev/null 2>&1
-    done
-  fi
+  BUILD_MODULES=1
 fi
 # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules
@@ -368 +285 @@
   /etc/init.d/vboxdrv stop || true
 fi
-if [ ! -f /etc/vbox/module_not_compiled ]; then
-  depmod -a
+if [ $BUILD_MODULES -eq 1 ]; then
+  /etc/init.d/vboxdrv setup || true
+else
   /etc/init.d/vboxdrv start > /dev/null
-  /etc/init.d/vboxweb-service start > /dev/null
-fi
+fi
+/etc/init.d/vboxweb-service start > /dev/null
 
 
@@ -405 +323 @@
 DKMS=`which dkms 2>/dev/null`
 if [ -n "$DKMS" ]; then
-  $DKMS remove -m vboxnetadp -v %VER% --all > /dev/null 2>&1 || true
-  $DKMS remove -m vboxnetflt -v %VER% --all > /dev/null 2>&1 || true
-  $DKMS remove -m vboxdrv -v %VER% --all > /dev/null 2>&1 || true
+  $DKMS remove -m vboxhost -v %VER% --all > /dev/null 2>&1 || true
 fi