Changeset 36671 in vbox

Timestamp:

Apr 14, 2011 2:06:10 PM (14 years ago)

Author:

vboxsync

Message:

Trunk: forward ported r70873: Installer/linux: no "make kernelrelease" anymore when compiling the Linux host kernel modules because that does not work with Linux 2.6.38 anymore

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/HostDrivers/Support/linux/Makefile (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile (modified) (1 diff)

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

@@ -176 +176 @@
                       KERN_DIR=<directory> and run Make again.)
   endif
-  # check if versions match -- works only for later 2.6 kernels
-  VBOX_KERN_VER := $(shell $(MAKE) -sC $(KERN_DIR) --no-print-directory kernelrelease 2> /dev/null || true)
-  ifneq ($(VBOX_KERN_VER),)
-   ifneq ($(VBOX_KERN_VER),$(shell uname -r))
-    $(error Error: /usr/src/linux (version $(VBOX_KERN_VER)) does not match \
-                   the current kernel (version $(shell uname -r)))
-   endif
-  endif
  else
-  # build for a dedicated kernel, no version check
   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
    $(error Error: KERN_DIR does not point to a directory)

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile

@@ -95 +95 @@
                       KERN_DIR=<directory> and run Make again.)
   endif
-  # check if versions match -- works only for later 2.6 kernels
-  VBOX_KERN_VER := $(shell $(MAKE) -sC $(KERN_DIR) --no-print-directory kernelrelease 2> /dev/null || true)
-  ifneq ($(VBOX_KERN_VER),)
-   ifneq ($(VBOX_KERN_VER),$(shell uname -r))
-    $(error Error: /usr/src/linux (version $(VBOX_KERN_VER)) does not match \
-                   the current kernel (version $(shell uname -r)))
-   endif
-  endif
  else
-  # build for a dedicated kernel, no version check
   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
    $(error Error: KERN_DIR does not point to a directory)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

@@ -99 +99 @@
                       KERN_DIR=<directory> and run Make again.)
   endif
-  # check if versions match -- works only for later 2.6 kernels
-  VBOX_KERN_VER := $(shell $(MAKE) -sC $(KERN_DIR) --no-print-directory kernelrelease 2> /dev/null || true)
-  ifneq ($(VBOX_KERN_VER),)
-   ifneq ($(VBOX_KERN_VER),$(shell uname -r))
-    $(error Error: /usr/src/linux (version $(VBOX_KERN_VER)) does not match \
-                   the current kernel (version $(shell uname -r)))
-   endif
-  endif
  else
-  # build for a dedicated kernel, no version check
   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
    $(error Error: KERN_DIR does not point to a directory)