diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2011-04-22 11:24:51 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2011-04-22 11:24:51 +0200 |
| commit | 3c3b014d3682252dbc133a6d2cd5dd2f8a028bbe (patch) | |
| tree | b5eb77e20ee70b9bd9b767e52888639d4136c81d /src/VBox/HostDrivers/VBoxNetAdp/linux | |
| parent | 0eeddfd8dc6b9702278fdefa2dee1d3f465e0ea2 (diff) | |
| download | virtualbox-3c3b014d3682252dbc133a6d2cd5dd2f8a028bbe.tar.gz | |
Imported Upstream version 4.0.6-dfsgupstream/4.0.6-dfsg
Diffstat (limited to 'src/VBox/HostDrivers/VBoxNetAdp/linux')
| -rw-r--r-- | src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile | 16 | ||||
| -rwxr-xr-x | src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile index 6b0e68cf5..48a26546e 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile @@ -94,16 +94,7 @@ ifeq ($(KERNELRELEASE),) Linux kernel. If this is not correct, specify \ 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) endif @@ -159,6 +150,11 @@ ifndef INCL INCL += $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux) export INCL endif +ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp),) + MANGLING := $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h +else + MANGLING := $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h +endif KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING ifdef VBOX_REDHAT_KABI @@ -193,7 +189,7 @@ MODULE_EXT := ko $(MODULE)-y := $(OBJS) # build defs -EXTRA_CFLAGS += $(INCL) $(KFLAGS) $(KDEBUG) +EXTRA_CFLAGS += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG) all: $(MODULE) diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp index 3d5b1cbe1..ab7c5c5d4 100755 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp @@ -1,5 +1,5 @@ #!/bin/sh -# $Revision: 69206 $ +# $Revision: 70408 $ ## @files # Shared file between Makefile.kmk and export_modules # @@ -31,6 +31,7 @@ VBOX_VBOXNETADP_SOURCES=" \ ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \ ${PATH_ROOT}/include/iprt/initterm.h=>include/iprt/initterm.h \ ${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \ + ${PATH_ROOT}/include/iprt/mangling.h=>include/iprt/mangling.h \ ${PATH_ROOT}/include/iprt/mem.h=>include/iprt/mem.h \ ${PATH_ROOT}/include/iprt/memobj.h=>include/iprt/memobj.h \ ${PATH_ROOT}/include/iprt/mp.h=>include/iprt/mp.h \ @@ -57,6 +58,7 @@ VBOX_VBOXNETADP_SOURCES=" \ ${PATH_ROOT}/include/VBox/vmm/stam.h=>include/VBox/vmm/stam.h \ ${PATH_ROOT}/include/VBox/sup.h=>include/VBox/sup.h \ ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \ + ${PATH_ROOT}/include/VBox/SUPDrvMangling.h=>include/VBox/SUPDrvMangling.h \ ${PATH_ROOT}/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c=>linux/VBoxNetAdp-linux.c \ ${PATH_ROOT}/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c=>VBoxNetAdp.c \ ${PATH_ROOT}/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h=>VBoxNetAdpInternal.h \ |