Changeset 68922 in vbox for trunk/debian

Timestamp:

Sep 29, 2017 8:58:36 AM (7 years ago)

Author:

vboxsync

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

118188

Message:

debian/rules: adjust kernel module building to recent Make file changes.
bugref:4567:Linux kernel driver maintenance

When the Linux kernel module Make files were reworked recently we switched
from specifying the kernel to use via a build folder path to specifying
a version and deducing the path. The Debian rules file did not get updated
though, so this change does that.

File:

• trunk/debian/rules (modified) (1 diff)

trunk/debian/rules

@@ -121 +121 @@
         for d in $(wildcard /lib/modules/*); do \
             if [ -L $$d/build ]; then \
-                make -C $(builddir)/bin/src/vboxdrv KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
-                make -j4 -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
-                make -C $(builddir)/bin/src/vboxnetflt KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
+                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \
+                make -j4 -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
+                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \
                 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
-                make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
-                make -C $(builddir)/bin/src/vboxnetadp KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
+                make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
+                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \
                 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
-                make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
-                make -C $(builddir)/bin/src/vboxpci KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
+                make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
+                make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
                 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
-                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
+                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
             fi; \
         done