Changeset 87742 in vbox for trunk/src/VBox/HostDrivers/linux

Timestamp:

Feb 12, 2021 4:38:55 PM (4 years ago)

Author:

vboxsync

Message:

HostDrivers/linux: More (mostly) wrapper related tweaks. Automatically use sudo when invoking insmod/rmmod if we're not root. bugref:9937

File:

• trunk/src/VBox/HostDrivers/linux/Makefile (modified) (8 diffs)

trunk/src/VBox/HostDrivers/linux/Makefile

@@ -43 +43 @@
 
 # convenience Makefile without KERNELRELEASE
+
+ifndef SUDO
+ ifneq ($(shell id -u),0)
+SUDO := $(firstword $(wildcard /usr/bin/sudo /bin/sudo /usr/sbin/sudo))
+ else
+SUDO :=
+ endif
+endif
 
 KBUILD_VERBOSE ?=
@@ -122 +130 @@
   define wrapper_template
 $(wrapper): $(subst $(wrapper),,vbox_vmmr0)
-        $$(MAKE) KBUILD_VERBOSE=$$(KBUILD_VERBOSE) -C $(wrapper)/
-
-load-$(wrapper): $(if $(eq $(wrapper),vbox_vmmr0),,load-vbox_vmmr0)
+        +$$(MAKE) KBUILD_VERBOSE=$$(KBUILD_VERBOSE) -C $(wrapper)/
+
+load-$(wrapper): $(subst load-$(wrapper),,load-vbox_vmmr0)
         @if ! grep -q "^$(wrapper) " /proc/modules; then \
         echo "Loading $(wrapper)..."; \
-                /sbin/insmod $(wrapper)/$(wrapper).ko; \
+                $(SUDO) /sbin/insmod $(wrapper)/$(wrapper).ko; \
         else \
         echo "Skipping loading $(wrapper) module (already loaded)."; \
@@ -135 +143 @@
         @if grep -q "^$(wrapper) " /proc/modules; then \
         echo "Unloading $(wrapper)..."; \
-                /sbin/rmmod $(wrapper)/$(wrapper).ko; \
+                $(SUDO) /sbin/rmmod $(wrapper)/$(wrapper).ko; \
         fi
   endef
@@ -141 +149 @@
 
 wrappers:       $(VBOX_WRAPPER_DIRS)
-load-wrappers: $(addprefix load-,$(VBOX_WRAPPER_DIRS))
-unload-wrappers:
+wrappers-load: $(addprefix load-,$(VBOX_WRAPPER_DIRS))
+wrappers-unload:
         @for module in $(filter-out vbox_vmmr0,$(VBOX_WRAPPER_DIRS)) $(filter vbox_vmmr0,$(VBOX_WRAPPER_DIRS)); \
         do \
                 if grep -q "^$${module} " /proc/modules; then \
                         echo "Unloading $${module}..."; \
-                if \
-        done
+                        $(SUDO) /sbin/rmmod "$${module}"; \
+                fi \
+        done
+wrappers-reload: wrappers-unload
+        +$(MAKE) -f $(lastword $(MAKEFILE_LIST)) --no-print-directory wrappers-load
 
 buildid:
@@ -158 +169 @@
                         ln -sfn -- "$(CURDIR)/$${module}" ~/.debug/.build-id/$${buildid}; \
                 else \
-                        echo "warning: No build ID for $${module}}"; \
+                        echo "warning: No build ID for $${module}"; \
                 fi \
         done
 
-.PHONY: wrappers load-wrappers unload-wrappers buildid $(VBOX_WRAPPER_DIRS) \
+.PHONY: wrappers wrappers-load wrappers-unload buildid $(VBOX_WRAPPER_DIRS) \
         $(addprefix load-,$(VBOX_WRAPPER_DIRS)) $(addprefix unload-,$(VBOX_WRAPPER_DIRS))
 
@@ -175 +186 @@
 install:
 wrappers:
-load-wrappers:
-unload-wrappers:
-buildid-wrappers:
+wrappers-load:
+wrappers-unload:
+buildid:
 
  endif
@@ -212 +223 @@
                 if grep "^$$module " /proc/modules >/dev/null; then \
                         echo "Removing previously installed $$module module"; \
-                        /sbin/rmmod $$module; \
+                        $(SUDO) /sbin/rmmod $$module; \
                 fi; \
         done
@@ -220 +231 @@
                 if test -f $$module.ko; then \
                         echo "Installing $$module module"; \
-                        /sbin/insmod $$module.ko; \
+                        $(SUDO) /sbin/insmod $$module.ko; \
                 fi; \
         done