Changeset 82695 in vbox

Timestamp:

Jan 9, 2020 1:30:00 PM (5 years ago)

Author:

vboxsync

Message:

Linux kernel module build: adjust for Linux 5.5 requiring the make variable and not using the old fixed name fallback any more for Module.symvers

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• src/VBox/Additions/linux/Makefile (modified) (2 diffs)
• src/VBox/HostDrivers/linux/build_in_tmp (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (1 diff)

trunk/Config.kmk

@@ -4600 +4600 @@
  ## @param 1    Module name.
  ## @param 2    The test build which symvers we need (empty if none)
- ## @param 3     Save symvers if non-empty.
+ ## @param 3    Save symvers if non-empty.
  ##
  ## @note Using the extra expansion to replace $(1), $(2) and $(3) before eval,
@@ -4631 +4631 @@
    endif
         + $(QUIET)$(REDIRECT_EXT) -d2=1 -w1 "$$(PATH_TARGET)/tst$(1)_mod/make.err" -- \
-                make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) VBOX_KERN_QUIET=1 $(if-expr $(KMK_OPTS_JOBS) != 0,JOBS=$(KMK_OPTS_JOBS),) -C $$(PATH_TARGET)/tst$(1)_mod
+                make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) VBOX_KERN_QUIET=1 $(if $(2),KBUILD_EXTRA_SYMBOLS="$$(PATH_TARGET)/tst$(1)_mod/Module.symvers",) $(if-expr $(KMK_OPTS_JOBS) != 0,JOBS=$(KMK_OPTS_JOBS),) -C $$(PATH_TARGET)/tst$(1)_mod
         $(CAT) "$$(PATH_TARGET)/tst$(1)_mod/make.err"
         $(QUIET)! grep "^WARNING: .* undefined!$$$$" "$$(PATH_TARGET)/tst$(1)_mod/make.err"

trunk/debian/rules

@@ -129 +129 @@
                 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_VER=$$(basename $$d) all; \
+                make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers 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_VER=$$(basename $$d) all; \
+                make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers 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_VER=$$(basename $$d) all; true; \
+                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all ; \
+                make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean; true
             fi; \
         done
-        make -C $(builddir)/bin/src/vboxdrv clean
-        make -C $(builddir)/bin/src/vboxnetflt clean
-        make -C $(builddir)/bin/src/vboxnetadp clean
-        make -C $(builddir)/bin/src/vboxpci clean; true
         touch debian/modules-stamp
 

trunk/src/VBox/Additions/linux/Makefile

@@ -51 +51 @@
             fi; \
             echo "=== Building 'vboxsf' module ==="; \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf || exit 1; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxsf/Module.symvers) -C vboxsf || exit 1; \
             if [ -f vboxsf/vboxsf.ko ]; then \
                 cp vboxsf/vboxsf.ko .; \
@@ -66 +66 @@
             fi; \
             echo "=== Building 'vboxvideo' module ==="; \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo || exit 1; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxvideo/Module.symvers) -C vboxvideo || exit 1; \
             if [ -f vboxvideo/vboxvideo.ko ]; then \
                 cp vboxvideo/vboxvideo.ko .; \

trunk/src/VBox/HostDrivers/linux/build_in_tmp

@@ -73 +73 @@
 if [ -n "$USE_MOD_SYMVERS" ]; then
   cp $USE_MOD_SYMVERS $tmpdir/Module.symvers
+  MAKE_EXTRAOPTS="KBUILD_EXTRA_SYMBOLS=$tmpdir/Module.symvers"
 fi
 
 # make, cleanup if success
 cd "$tmpdir"
-if make "-j`echo ${MAKE_JOBS}`" "$@"; then  # strip leading space from "MAKE_JOBS"
+if make "-j`echo ${MAKE_JOBS}`" "$@" ${MAKE_EXTRAOPTS}; then  # strip leading space from "MAKE_JOBS"
   if [ -n "$SAVE_MOD_SYMVERS" ]; then
     if [ -f Module.symvers ]; then

trunk/src/VBox/Installer/linux/debian/rules

@@ -159 +159 @@
                 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_VER=$$(basename $$d) all; \
+                make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers 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_VER=$$(basename $$d) all; \
+                make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers 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_VER=$$(basename $$d) all; true; \
+                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all ; \
+                make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean; true
             fi; \
         done
-        make -C $(builddir)/bin/src/vboxdrv clean
-        make -C $(builddir)/bin/src/vboxnetflt clean
-        make -C $(builddir)/bin/src/vboxnetadp clean
-        make -C $(builddir)/bin/src/vboxpci clean; true
         touch debian/modules-stamp