Changeset 69563 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 3, 2017 2:32:12 PM (8 years ago)

Author:

vboxsync

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

118912

Message:

Additions/linux/drm: better detection for EL7 variants.
bugref:4567: Linux kernel driver maintenance

r118292/r68647 was very invasive and broke Debian 9 on top. This change
refines the check for supported guests for the drm driver by checking the
kernel version string to be sure that it either starts with a supported
version (that is, not 3.10.x or older) or contains the EL7 signature.

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
+BUILD =
 
-# 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.
-ifeq ($(wildcard $(KERN_INCL)/drm/drm_rect.h),)
- BUILD =
+# We want to build on Linux 3.11 and later and on all EL 7 kernels.
+ifneq ($(filter-out 1.% 2.% 3.0.% 3.1.% 3.2.% 3.3.% 3.4.% 3.5.% 3.6.% 3.7.% \
+                    3.8.% 3.9.% 3.10.%,$(KERN_VER)),)
+ BUILD = 1
 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
+ifeq ($(filter-out %.el7.x86_64,$(KERN_VER)),)
+ BUILD = 1
 endif