Changeset 68644 in vbox

Timestamp:

Sep 5, 2017 2:08:31 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: clean up Makefile.
bugref:4567: Linux kernel driver maintenance

Make the make file work properly with unsupported kernels, i.e. not build.
Also do some clean-up.

File:

• trunk/src/VBox/Additions/linux/drm/Makefile.module.kms (modified) (1 diff)

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

@@ -18 +18 @@
 #
 
-MY_KERNELRELEASE := $(KERNELRELEASE)
-ifeq ($(MY_KERNELRELEASE),)
-  # as of 2.6.16 KERNELRELEASE is only set if the kernel is configured
-  MY_KERNELRELEASE := $(KERNELVERSION)
-endif
-ifeq ($(filter 1.% 2.% 3.0.% 3.1.% 3.2.% 3.3.% 3.4.% 3.5.% 3.6.% 3.7.% \
-3.8.% 3.9.%,$(MY_KERNELRELEASE)),)
-
 # Linux kbuild sets this to our source directory if we are called from there
 obj ?= $(CURDIR)
 include $(obj)/Makefile.include.header
 
-# sledgehammer, see the 2.4 handling in Makefile.include.footer
-ifneq ($(KERN_VERSION),24)
+# We want to build on Linux 3.11 and later, plus the 3.10 EL 7.3 and later
+# kernels.  This file was added in 3.11 and back-ported to the EL 7.3 kernel.
+ifneq ($(wildcard $(KERN_INCL)/drm/drm_rect.h),)
 
 MOD_NAME   = vboxvideo
-
 MOD_OBJS   = hgsmi_base.o \
              modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
              vbox_mode.o vbox_ttm.o vbva_base.o vbox_prime.o vbox_hgsmi.o
-
-MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
-MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
-# What on earth is this?
-# MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
-MOD_INCL  += -Iinclude/drm
-MOD_DEFS  := -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
-             -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
-             -DIN_GUEST_R0
-# our module does not export any symbol
-MOD_DEFS  += -DRT_NO_EXPORT_SYMBOL
-ifeq ($(BUILD_TARGET_ARCH),amd64)
- MOD_DEFS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
-else
- MOD_DEFS += -DRT_ARCH_X86
-endif
-MOD_CLEAN  = . linux r0drv r0drv/linux
+MOD_INCL   = -I$(KBUILD_EXTMOD) -Iinclude/drm
 
 include $(obj)/Makefile.include.footer
 
-else # KERN_VERSION=24
+else  # ! wildcard $(KERN_INCL)/drm/drm_rect.h
 
-all:
+ all:
+ install:
+ clean:
 
-endif # KERN_VERSION=24
-
-else # ifneq ($(filter ...,$(MY_KERNELRELEASE)),)
-
-all:
-
-endif # ifneq ($(filter ...,$(MY_KERNELRELEASE)),)
-
+endif  # ! wildcard $(KERN_INCL)/drm/drm_rect.h