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

Timestamp:

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

Author:

vboxsync

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

118374

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/Additions/linux/installer

Files:

• install.sh.in (modified) (1 diff)
• vboxadd.sh (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