Changeset 36510 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Apr 1, 2011 3:37:35 PM (14 years ago)

Author:

vboxsync

Message:

Additions/linux: make vboxguest.ko makefile use generic header and footer

Location:

trunk/src/VBox/Additions/common/VBoxGuest/linux

Files:

• Makefile (modified) (6 diffs)
• files_vboxguest (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
 #
 
-#
-# First, figure out which architecture we're targeting and the build type.
-# (We have to support basic cross building (ARCH=i386|x86_64).)
-# While at it, warn about BUILD_* vars found to help with user problems.
-#
-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
- BUILD_TARGET_ARCH_DEF := amd64
-else
- BUILD_TARGET_ARCH_DEF := x86
-endif
-ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
- $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
- BUILD_TARGET_ARCH :=
-endif
-ifeq ($(BUILD_TARGET_ARCH),)
- ifeq ($(ARCH),x86_64)
-  BUILD_TARGET_ARCH := amd64
- else
-  ifeq ($(ARCH),i386)
-   BUILD_TARGET_ARCH := x86
-  else
-   BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-  endif
- endif
-else
- ifneq ($(BUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH_DEF))
-  $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
- endif
-endif
+# Linux kbuild sets this to our source directory if we are called from there
+obj ?= $(CURDIR)
+include $(obj)/Makefile.include.header
 
-ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
- $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
- BUILD_TYPE :=
-endif
-ifeq ($(BUILD_TYPE),)
- BUILD_TYPE := release
-else
- ifneq ($(BUILD_TYPE),release)
-  $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
- endif
-endif
+MOD_NAME = vboxguest
 
-
-# override is required by the Debian guys
-override MODULE = vboxguest
-OBJS   = \
+MOD_OBJS   = \
         VBoxGuest-linux.o \
         VBoxGuest.o \
@@ -130 +91 @@
         VBox/logbackdoor.o
 ifeq ($(BUILD_TARGET_ARCH),x86)
-OBJS += \
+MOD_OBJS += \
         common/math/gcc/divdi3.o \
         common/math/gcc/moddi3.o \
@@ -138 +99 @@
 endif
 ifeq ($(BUILD_TARGET_ARCH),amd64)
-OBJS += common/alloc/heapsimple.o
+MOD_OBJS +=     common/alloc/heapsimple.o
 endif
 
-ifneq ($(MAKECMDGOALS),clean)
+MOD_DEFS = -DIN_GUEST -DIN_GUEST_R0 -DIN_MODULE -DRT_WITH_VBOX -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM
+ifeq ($(BUILD_TARGET_ARCH),amd64)
+ MOD_DEFS  += -DRT_ARCH_AMD64
+else
+ MOD_DEFS  += -DRT_ARCH_X86
+endif
+ifeq ($(BUILD_TARGET_ARCH),amd64)
+ MOD_DEFS += -DVBOX_WITH_64_BITS_GUESTS
+endif
+MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL += $(addprefix -I$(KBUILD_EXTMOD)/vboxguest,/ /include /r0drv/linux)
 
-ifeq ($(KERNELRELEASE),)
-
- #
- # building from this directory
- #
-
- # kernel base directory
- ifndef KERN_DIR
-  KERN_DIR := /lib/modules/$(shell uname -r)/build
-  ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-   KERN_DIR := /usr/src/linux
-   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-    $(error Error: unable to find the sources of your current Linux kernel. \
-                   Specify KERN_DIR=<directory> and run Make again)
-   endif
-   $(warning Warning: using /usr/src/linux as the source directory of your \
-                      Linux kernel. If this is not correct, specify \
-                      KERN_DIR=<directory> and run Make again.)
-  endif
- else
-  ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-   $(error Error: KERN_DIR does not point to a directory)
-  endif
- endif
-
- # includes
- ifndef KERN_INCL
-  KERN_INCL = $(KERN_DIR)/include
- endif
- ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-  $(error Error: unable to find the include directory for your current Linux \
-                 kernel. Specify KERN_INCL=<directory> and run Make again)
- endif
-
- # module install dir, only for current kernel
- ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-  ifndef MODULE_DIR
-   MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-   ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-    MODULE_DIR := $(MODULE_DIR_TST)/misc
-   else
-    $(error Unable to find the folder to install the additions driver to)
-   endif
-  endif # MODULE_DIR unspecified
- endif
-
- # 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
- else
-  KERN_VERSION := 26
- endif
-
-else # neq($(KERNELRELEASE),)
-
- #
- # building from kbuild (make -C <kernel_directory> M=`pwd`)
- #
-
- # guess kernel version (24 or 26)
- ifeq ($(shell if echo "$(VERSION).$(PATCHLEVEL)." | grep '2\.4\.' > /dev/null; then echo yes; fi),yes)
-  KERN_VERSION := 24
- else
-  KERN_VERSION := 26
- endif
-
-endif # neq($(KERNELRELEASE),)
-
-# debug - show guesses.
-ifdef DEBUG
-$(warning dbg: KERN_DIR     = $(KERN_DIR))
-$(warning dbg: KERN_INCL    = $(KERN_INCL))
-$(warning dbg: MODULE_DIR   = $(MODULE_DIR))
-$(warning dbg: KERN_VERSION = $(KERN_VERSION))
-endif
-
-KBUILD_VERBOSE ?= 1
-
-#
-# Compiler options
-#
-ifndef INCL
- INCL    := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL))
- ifndef KBUILD_EXTMOD
-  KBUILD_EXTMOD := $(shell pwd)
- endif
- INCL    += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- INCL    += $(addprefix -I$(KBUILD_EXTMOD)/vboxguest,/ /include /r0drv/linux)
- export INCL
-endif
 ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxguest),)
  MANGLING := $(KBUILD_EXTMOD)/vboxguest/include/VBox/VBoxGuestMangling.h
@@ -238 +119 @@
  MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
 endif
-KFLAGS   := -D__KERNEL__ -DMODULE \
-        -DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST -DIN_GUEST_R0 \
-        -DIN_MODULE -DRT_WITH_VBOX -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM
-ifeq ($(BUILD_TARGET_ARCH),amd64)
- KFLAGS  += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
+ifeq ($(KERN_VERSION),24)
+ MOD_CFLAGS =
 else
- KFLAGS  += -DRT_ARCH_X86
-endif
-ifeq ($(BUILD_TYPE),debug)
-KFLAGS   += -DDEBUG
+ MOD_CFLAGS = -include $(MANGLING)
 endif
 
-ifeq ($(KERN_VERSION), 24)
-#
-# 2.4
-#
+MOD_CLEAN = . linux r0drv generic r0drv/linux r0drv/generic VBox \
+                common/alloc common/err common/log common/math/gcc common/misc \
+                common/string common/time
 
-ifeq ($(BUILD_TARGET_ARCH),amd64)
- KFLAGS  += -mcmodel=kernel
-endif
+include $(obj)/Makefile.include.footer
 
-CFLAGS := -O2 -DVBOX_LINUX_2_4 -DEXPORT_SYMTAB $(INCL) $(KFLAGS) $(KDEBUG)
-MODULE_EXT := o
-
-# 2.4 Module linking
-$(MODULE).o: $(OBJS)
-        $(LD) -o $@ -r $(OBJS)
-
-.PHONY: $(MODULE)
-all: $(MODULE)
-$(MODULE): $(MODULE).o
-
-else
-#
-# 2.6 and later
-#
-
-MODULE_EXT := ko
-
-$(MODULE)-y  := $(OBJS)
-
-# build defs
-EXTRA_CFLAGS += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
-
-all: $(MODULE)
-
-obj-m += $(MODULE).o
-
-$(MODULE):
-        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
-
-endif
-
-install: $(MODULE)
-        @mkdir -p $(MODULE_DIR); \
-        install -m 0664 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
-        PATH="$(PATH):/bin:/sbin" depmod -a;
-
-endif # eq($(MAKECMDGOALS),clean)
-
-check: $(MODULE)
+check: $(MOD_NAME)
         @if ! readelf -p __ksymtab_strings vboxguest.ko | grep -E "\[.*\]  *(RT|g_..*RT.*)"; then \
             echo "All exported IPRT symbols are properly renamed!"; \
@@ -305 +138 @@
             false; \
          fi
-
-clean:
-        for f in . linux r0drv generic r0drv/linux r0drv/generic VBox \
-            common/alloc common/err common/log common/math/gcc common/misc common/string common/time; \
-            do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
-        rm -rf .vboxguest* .tmp_ver* vboxguest.* Module.symvers Modules.symvers modules.order

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -82 +82 @@
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h=>VBoxGuestLog.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp=>VMMDev.c \
+    ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.header \
+    ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.footer \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/assert.h=>include/internal/assert.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/initterm.h=>include/internal/initterm.h \