Changeset 6857 in vbox

Timestamp:

Feb 7, 2008 8:15:42 PM (17 years ago)

Author:

vboxsync

Message:

Linux modules: unbreak compilation against Linux 2.4

Location:

trunk/src/VBox

Files:

• Additions/linux/module/Makefile.module (modified) (1 diff)
• Additions/linux/sharedfolders/Makefile.module (modified) (1 diff)
• HostDrivers/Support/linux/Makefile (modified) (1 diff)

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

@@ -93 +93 @@
 
  # guess kernel version (24 or 26)
- ifeq ($(shell if grep '"2.4.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
- KERN_VERSION := 24
+ ifeq ($(shell if grep '"2\.4\.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
+  KERN_VERSION := 24
  else
- KERN_VERSION := 26
+  KERN_VERSION := 26
  endif
- # KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
 
 else # neq($(KERNELRELEASE),)
 
  #
- # building from Linux-2.6-kbuild (make -C <kernel_directory> M=`pwd`)
+ # building from kbuild (make -C <kernel_directory> M=`pwd`)
  #
 
- KERN_VERSION := 26
+ # guess kernel version (24 or 26)
+ ifeq ($(shell if grep '"2\.4\.' $(PWD)/include/linux/version.h > /dev/null; then echo yes; fi),yes)
+  KERN_VERSION := 24
+ else
+  KERN_VERSION := 26
+ endif
 
 endif # neq($(KERNELRELEASE),)

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

@@ -91 +91 @@
 
  # guess kernel version (24 or 26)
- ifeq ($(shell if grep '"2.4.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
- KERN_VERSION := 24
+ ifeq ($(shell if grep '"2\.4\.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
+  KERN_VERSION := 24
  else
- KERN_VERSION := 26
- endif
- # KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
+  KERN_VERSION := 26
+ endif
 
 else # neq($(KERNELRELEASE),)
 
  #
- # building from Linux-2.6-kbuild (make -C <kernel_directory> M=`pwd`)
- #
-
- KERN_VERSION := 26
+ # building from kbuild (make -C <kernel_directory> M=`pwd`)
+ #
+
+ # guess kernel version (24 or 26)
+ ifeq ($(shell if grep '"2\.4\.' $(PWD)/include/linux/version.h > /dev/null; then echo yes; fi),yes)
+  KERN_VERSION := 24
+ else
+  KERN_VERSION := 26
+ endif
 
 endif # neq($(KERNELRELEASE),)

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

@@ -168 +168 @@
 
  #
- # building from Linux-2.6-kbuild (make -C <kernel_directory> M=`pwd`)
- #
-
- KERN_VERSION := 26
+ # 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),)