Changeset 69086 in vbox for trunk

Timestamp:

Oct 13, 2017 6:29:42 PM (7 years ago)

Author:

vboxsync

Message:

Linux kernel module builds: Use KERN_VER not KERN_DIR to specify a kernel.
bugref:4567: Linux kernel driver maintenance

Some time ago I changed to specifying the kernel version using KERN_VER
rather than the kernel build directory using KERN_DIR when building modules
for the non-default kernel. Some places did not get updated. This change
fixes that.

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/install.sh.in (modified) (1 diff)
• Additions/linux/installer/vboxadd.sh (modified) (1 diff)
• Installer/linux/install.sh (modified) (1 diff)
• Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -21 +21 @@
 #   built matches the one loaded and 2 is returned otherwise.  E.g. VBoxClient
 #   running will prevent vboxguest reloading.
-# * If the kernel modules cannot be built (run the installer with KERN_DIR=/) or
-#   loaded (run with KERN_VER=<installed non-current version>) then 1 is returned.
+# * If the kernel modules cannot be built (run the installer with KERN_VER=none)
+#   or loaded (run with KERN_VER=<installed non-current version>) then 1 is
+#   returned.
 
 PATH=$PATH:/bin:/sbin:/usr/sbin

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

@@ -418 +418 @@
 #!/bin/sh
 test -d "/lib/modules/\${1}/build" || exit 0
-KERN_DIR="/lib/modules/\${1}/build" MODULE_DIR="/lib/modules/\${1}/misc" \
-/sbin/rcvboxadd quicksetup
+KERN_VER="\${1}" /sbin/rcvboxadd quicksetup
 exit 0
 EOF

trunk/src/VBox/Installer/linux/install.sh

@@ -19 +19 @@
 # * After successful installation, 0 is returned if the vboxdrv module version
 #   built matches the one loaded.
-# * If the kernel modules cannot be built (run the installer with KERN_DIR=/) or
-#   loaded (run with KERN_DIR=/lib/modules/<installed non-current version>/build)
+# * If the kernel modules cannot be built (run the installer with KERN_VER=none)
+#   or loaded (run with KERN_VER=<installed non-current version>)
 #   then 1 is returned.
 

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

@@ -111 +111 @@
       --save-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxdrv \
-      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
+      KBUILD_VERBOSE= KERN_VER=${d%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
       %INSTMOD%
     ./src/vboxhost/build_in_tmp \
       --use-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxnetflt \
-      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
+      KBUILD_VERBOSE= KERN_VER=${d%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
       %INSTMOD%
     ./src/vboxhost/build_in_tmp \
       --use-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxnetadp \
-      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
+      KBUILD_VERBOSE= KERN_VER=${d%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
       %INSTMOD%
     ./src/vboxhost/build_in_tmp \
       --use-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxpci \
-      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
+      KBUILD_VERBOSE= KERN_VER=${d%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
       %INSTMOD%
   fi