Changeset 81763 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Nov 11, 2019 3:57:41 PM (5 years ago)

Author:

vboxsync

Message:

INstaller/linux: Honor VBOX_WITH_PCI_PASSTHROUGH during packing and modify vboxdrv.sh to not fail when vboxpci is not available

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• vboxdrv.sh (modified) (3 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -417 +417 @@
 include $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp
 VBOX_LNX_INST_FILES_VBOXNETADP=$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxnetadp/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXNETADP_SOURCES)))))
-include $(PATH_ROOT)/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci
-VBOX_LNX_INST_FILES_VBOXPCI=$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxpci/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXPCI_SOURCES)))))
+
+ifdef VBOX_WITH_PCI_PASSTHROUGH
+ include $(PATH_ROOT)/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci
+ VBOX_LNX_INST_FILES_VBOXPCI=$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxpci/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXPCI_SOURCES)))))
+endif
 
 VBOX_LNX_INST_ARCH_DEPS := \
@@ -427 +430 @@
         $(VBOX_LNX_INST_FILES_VBOXNETFLT) \
         $(VBOX_LNX_INST_FILES_VBOXNETADP) \
-        $(VBOX_LNX_INST_FILES_VBOXPCI)
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),$(VBOX_LNX_INST_FILES_VBOXPCI),)
 
 #

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

@@ -88 +88 @@
 
 KERN_VER=`uname -r`
-MODULE_LIST="vboxdrv vboxnetflt vboxnetadp vboxpci"
+if test -e "${MODULE_SRC}/vboxpci"; then
+    MODULE_LIST="vboxdrv vboxnetflt vboxnetadp vboxpci"
+else
+    MODULE_LIST="vboxdrv vboxnetflt vboxnetadp"
+fi
 # Secure boot state.
 case "`mokutil --sb-state 2>/dev/null`" in
@@ -325 +329 @@
         failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why"
     fi
-    if ! $MODPROBE vboxpci > /dev/null 2>&1; then
+    if test -e "${MODULE_SRC}/vboxpci" && ! $MODPROBE vboxpci > /dev/null 2>&1; then
         failure "modprobe vboxpci failed. Please use 'dmesg' to find out why"
     fi
@@ -477 +481 @@
         failure "Look at $LOG to find out what went wrong"
     fi
-    log "Building the PCI pass-through module."
-    if ! myerr=`$BUILDINTMP \
-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
-        --module-source "$MODULE_SRC/vboxpci" \
-        --no-print-directory install 2>&1`; then
-        log "Error building the module:"
-        module_build_log "$myerr"
-        failure "Look at $LOG to find out what went wrong"
+    if test -e "$MODULE_SRC/vboxpci"; then
+        log "Building the PCI pass-through module."
+        if ! myerr=`$BUILDINTMP \
+            --use-module-symvers /tmp/vboxdrv-Module.symvers \
+            --module-source "$MODULE_SRC/vboxpci" \
+            --no-print-directory install 2>&1`; then
+            log "Error building the module:"
+            module_build_log "$myerr"
+            failure "Look at $LOG to find out what went wrong"
+        fi
     fi
     rm -f /etc/vbox/module_not_compiled