Changeset 375 in vbox for trunk

Timestamp:

Jan 26, 2007 7:18:45 PM (18 years ago)

Author:

vboxsync

Message:

Fixed the kernel module makefiles for OpenSUSE's non-standard build system

Location:

trunk/src/VBox

Files:

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

-              r214
+              r375
 # includes
 ifeq ($(KERN_INCL),)
+ifeq ($(shell if test -d $(KERN_DIR)/include; then echo yes; fi),yes)
+KERN_INCL = $(KERN_DIR)/include
+else
+KERN_INCL = /usr/src/linux/include
+$(warning Warning: defaulting to the includes in $(KERN_INCL). Specify KERN_INCL=<right-place> if this is not right.)
+endif
+ ifeq ($(shell if test -d $(KERN_DIR)/include; then echo yes; fi),yes)
+ KERN_INCL = $(KERN_DIR)/include
+# Instead of sticking to the standards, OpenSUSE 10.2 only puts a few include
+# files in /lib/modules/$(uname -r)/build/include, and puts the rest in
+# /lib/modules/$(uname -r)/source/include, which points into the kernel sources
+  EXTRA_INCL = -I/lib/modules/$(shell uname -r)/source/include
+ else
+ KERN_INCL = /usr/src/linux/include
+ $(warning Warning: defaulting to the includes in $(KERN_INCL). Specify KERN_INCL=<right-place> if this is not right.)
+ endif
 endif
 …
+#
 ifndef INCL
  INCL    := -I$(KERN_INCL)
+ INCL    := -I$(KERN_INCL) -I$(EXTRA_INCL)
  ifndef KBUILD_EXTMOD
   KBUILD_EXTMOD := $(shell pwd)

-              r345
+              r375
 ifndef $(KERN_INCL)
  KERN_INCL = $(KERN_DIR)/include
+# Instead of sticking to the standards, OpenSUSE 10.2 only puts a few include
+# files in /lib/modules/$(uname -r)/build/include, and puts the rest in
+# /lib/modules/$(uname -r)/source/include, which points into the kernel sources
+ EXTRA_INCL = -I/lib/modules/$(shell uname -r)/source/include
  $(info Info: using $(KERN_INCL) as the include directory of your Linux kernel. If this is not correct, specify KERN_INCL=<directory> and run Make again.)
 endif
 …
+#
 ifndef INCL
  INCL    := -I$(KERN_INCL)
+ INCL    := -I$(KERN_INCL) -I$(EXTRA_INCL)
  ifndef KBUILD_EXTMOD
   KBUILD_EXTMOD := $(shell pwd)

Note: See TracChangeset for help on using the changeset viewer.