Changeset 64732 in vbox for trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

Timestamp:

Nov 21, 2016 8:13:16 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: do not build the vboxvideo kernel driver at all on systems where it is not used rather than building a dummy which refuses to load with -EINVAL. This confusing behaviour was reported as a bug in ticketref:16206: vboxvideo.ko unable to be inserted into kernel on CentOS 6/7.

File:

• trunk/src/VBox/Additions/linux/drm/Makefile.module.kms (modified) (3 diffs)

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -18 +18 @@
 #
 
-# Linux kbuild sets this to our source directory if we are called from there
-obj ?= $(CURDIR)
-include $(obj)/Makefile.include.header
-
-MOD_NAME   = vboxvideo
-
 MY_KERNELRELEASE := $(KERNELRELEASE)
 ifeq ($(MY_KERNELRELEASE),)
@@ -31 +25 @@
 ifeq ($(filter 1.% 2.% 3.0.% 3.1.% 3.2.% 3.3.% 3.4.% 3.5.% 3.6.% 3.7.% \
 3.8.% 3.9.% 3.10.%,$(MY_KERNELRELEASE)),)
+
+# Linux kbuild sets this to our source directory if we are called from there
+obj ?= $(CURDIR)
+include $(obj)/Makefile.include.header
+
+MOD_NAME   = vboxvideo
+
 MOD_OBJS   = HGSMIBase.o HGSMICommon.o HGSMIMemAlloc.o \
              Modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
              vbox_mode.o vbox_ttm.o VBVABase.o
-else
-MOD_OBJS   = vbox_dummy.o
-endif
 
 MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
@@ -56 +54 @@
 
 include $(obj)/Makefile.include.footer
+
+endif
+