Changeset 69021 in vbox

Timestamp:

Oct 9, 2017 7:23:26 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118292

Message:

Additions/linux/drm: never try to build the drm module on EL6.
bugref:8524: Additions/linux: play nicely with distribution-installed Additions

RHEL6 has back-ported a lot of the current drm code to their 2.6.32 kernel,
but our driver still does not build there without fixes, and we do not
actually need it to. So disable building it altogether there.

File:

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

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

@@ -22 +22 @@
 include $(obj)/Makefile.include.header
 
+BUILD = 1
+
 # 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),)
+ifeq ($(wildcard $(KERN_INCL)/drm/drm_rect.h),)
+ BUILD =
+endif
+
+# And we do not want to build on EL6, regardless of what may have been
+# backported.
+ifneq ($(wildcard /etc/redhat-release),)
+ ifneq ($(shell grep "Enterprise.*release 6" /etc/redhat-release),)
+  BUILD =
+ endif
+endif
+
+ifneq ($(BUILD),)
 
 MOD_NAME   = vboxvideo