Changeset 17935 in vbox

Timestamp:

Mar 16, 2009 2:01:40 PM (16 years ago)

Author:

vboxsync

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

44507

Message:

Additions/linux: fixed kernel detection

Location:

trunk/src/VBox

Files:

• Additions/linux/drm/Makefile.module (modified) (2 diffs)
• Additions/linux/drm/vboxvideo_drm.c (modified) (2 diffs)
• Additions/linux/module/Makefile.module (modified) (1 diff)
• Additions/linux/sharedfolders/Makefile.module (modified) (1 diff)
• HostDrivers/Support/linux/Makefile (modified) (3 diffs)

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

@@ -122 +122 @@
 
  # guess kernel version (24 or 26)
- ifeq ($(shell if grep '"2\.4\.' $(PWD)/include/linux/version.h > /dev/null; then echo yes; fi),yes)
+ ifeq ($(shell if echo "$(VERSION).$(PATCHLEVEL)." | grep '2\.4\.' > /dev/null; then echo yes; fi),yes)
   KERN_VERSION := 24
  else
@@ -164 +164 @@
 
 # override is required by the Debian guys
-override MODULE = \
-        $(if $(strip $(foreach inc,$(patsubst -I%,%,$(INCL)),\
-                                        $(wildcard $(inc)/drm/drmP.h))),vboxvideo,)
-
-OBJS   = \
-        $(if $(strip $(foreach inc,$(patsubst -I%,%,$(INCL)),\
-                                        $(wildcard $(inc)/drm/drmP.h))),vboxvideo_drm.o,)
+override MODULE = vboxvideo
+OBJS   = vboxvideo_drm.o
 
 ifeq ($(KERN_VERSION), 24)

trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c

@@ -55 +55 @@
 
 #include <linux/autoconf.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+
 #include "drm/drmP.h"
 #include "vboxvideo_drm.h"
@@ -106 +110 @@
 MODULE_LICENSE("GPL and additional rights");
 
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */

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

@@ -158 +158 @@
 
  # guess kernel version (24 or 26)
- ifeq ($(shell if grep '"2\.4\.' $(PWD)/include/linux/version.h > /dev/null; then echo yes; fi),yes)
+ ifeq ($(shell if echo "$(VERSION).$(PATCHLEVEL)." | grep '2\.4\.' > /dev/null; then echo yes; fi),yes) 
   KERN_VERSION := 24
  else

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -149 +149 @@
 
  # guess kernel version (24 or 26)
- ifeq ($(shell if grep '"2\.4\.' $(PWD)/include/linux/version.h > /dev/null; then echo yes; fi),yes)
+ ifeq ($(shell if echo "$(VERSION).$(PATCHLEVEL)." | grep '2\.4\.' > /dev/null; then echo yes; fi),yes)
   KERN_VERSION := 24
  else

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -184 +184 @@
  endif
 
- # guess kernel version (24 or 26)
- KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-
 else # neq($(KERNELRELEASE),)
 
@@ -192 +189 @@
  # building from kbuild (make -C <kernel_directory> M=`pwd`)
  #
-
- # guess kernel version (24 or 26)
- KERN_VERSION := $(if $(wildcard $(PWD)/Rules.make),24,26)
 
 endif # neq($(KERNELRELEASE),)
@@ -203 +197 @@
 $(warning dbg: KERN_INCL    = $(KERN_INCL))
 $(warning dbg: MODULE_DIR   = $(MODULE_DIR))
-$(warning dbg: KERN_VERSION = $(KERN_VERSION))
 endif