Changeset 69090 in vbox for trunk

Timestamp:

Oct 13, 2017 8:25:36 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

Attempt to fix a problem with RPM percent-quoting in the last change.

File:

• trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)

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_VER=${d%%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) 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_VER=${d%%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) 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_VER=${d%%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) 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_VER=${d%%/lib/modules/} INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
       %INSTMOD%
   fi