Changeset 66072 in vbox

Timestamp:

Mar 13, 2017 8:15:33 PM (8 years ago)

Author:

vboxsync

Message:

HostDrivers, Additions: remove more rules for compiling Linux R0 modules

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (5 diffs)
• HostDrivers/Support/Makefile.kmk (modified) (6 diffs)
• HostDrivers/VBoxNetAdp/Makefile.kmk (modified) (4 diffs)
• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (3 diffs)
• HostDrivers/VBoxPci/Makefile.kmk (modified) (2 diffs)
• Runtime/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -20 +20 @@
 
 
-if1of ($(KBUILD_TARGET), darwin freebsd haiku $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) netbsd os2 solaris win)
+if1of ($(KBUILD_TARGET), darwin freebsd haiku netbsd os2 solaris win)
  #
  # VBoxGuest - The Guest Additions Driver.
@@ -28 +28 @@
  VBoxGuest_NAME.freebsd  = vboxguest
  VBoxGuest_NAME.haiku    = vboxguest
- VBoxGuest_NAME.linux    = vboxguest
  VBoxGuest_NAME.netbsd   = vboxguest
  VBoxGuest_NAME.solaris  = vboxguest
@@ -37 +36 @@
  endif
  VBoxGuest_DEFS.haiku    = VBOX_SVN_REV=$(VBOX_SVN_REV) _KERNEL_MODE=1
- VBoxGuest_DEFS.linux    = KBUILD_MODNAME=KBUILD_STR\(vboxguest\) KBUILD_BASENAME=KBUILD_STR\(vboxguest\) DEBUG_HASH=2 DEBUG_HASH2=3 EXPORT_SYMTAB
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
  VBoxGuest_DEFS.win      = VBOX_GUESTDRV_WITH_RELEASE_LOGGER
@@ -53 +51 @@
         $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
  VBoxGuest_DEPS.solaris += $(VBOX_SVN_REV_KMK)
- VBoxGuest_DEPS.linux   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEPS.haiku   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEPS.freebsd += $(VBOX_SVN_REV_HEADER)
@@ -62 +59 @@
  VBoxGuest_INCS.freebsd  = $(VBoxGuest_0_OUTDIR) $(PATH_STAGE)/gen-sys-hdrs
  VBoxGuest_INCS.netbsd   = $(VBoxGuest_0_OUTDIR)
- VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  ifeq ($(KBUILD_HOST),solaris)
   VBoxGuest_LDFLAGS.solaris         += -N misc/ctf

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -544 +544 @@
 # New VBoxDrv target. TODO: Convert all the above to use this!
 #
-if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
+if1of ($(KBUILD_TARGET), darwin freebsd solaris win)
  ifdef VBOX_WITH_VBOXDRV
   SYSMODS += VBoxDrv
@@ -550 +550 @@
  VBoxDrv_TEMPLATE         = VBOXR0DRV
  VBoxDrv_NAME.freebsd     = vboxdrv
- VBoxDrv_NAME.linux       = vboxdrv
  VBoxDrv_NAME.solaris     = vboxdrv
  ifdef VBOX_SIGNING_MODE
@@ -576 +575 @@
   VBoxDrv_DEFS.darwin    += VBOX_WITH_RAW_MODE
  endif
- VBoxDrv_DEFS.linux      := \
-        KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE CONFIG_VBOXDRV_AS_MISC
- ifdef VBOX_LINUX_VERSION_2_4
-  VBoxDrv_DEFS.linux     += EXPORT_SYMTAB
- endif
  ifdef VBOX_WITH_NETFLT
   VBoxDrv_DEFS.solaris   += VBOX_WITH_NETFLT
@@ -602 +596 @@
  VBoxDrv_INCS             = . $(VBoxDrv_0_OUTDIR)
  VBoxDrv_INCS.darwin      = ./darwin
- VBoxDrv_INCS.linux       = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
 
  VBoxDrv_LIBS             = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
- VBoxDrv_LIBS.linux.debug = $(VBoxDrv_LIBS) $(VBOX_GCC_LIBGCC)
  VBoxDrv_LIBS.win         = \
         $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
@@ -622 +614 @@
  VBoxDrv_SOURCES.darwin   = \
         darwin/SUPDrv-darwin.cpp
- VBoxDrv_SOURCES.linux    = \
-        linux/SUPDrv-linux.c
  VBoxDrv_SOURCES.solaris  = \
         solaris/SUPDrv-solaris.c
@@ -651 +641 @@
   VBoxDrv_SOURCES        += \
         SUPDrvTracerA.asm
- endif
- ifndef VBOX_LINUX_VERSION_2_4
-  VBoxDrv_SOURCES.linux  += \
-        linux/SUPDrv-linux.mod.c
  endif
 

trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-if1of ($(KBUILD_TARGET), solaris darwin linux freebsd)
+if1of ($(KBUILD_TARGET), solaris darwin freebsd)
  #
  # VBoxNetAdp - Virtual Network Adapter
@@ -30 +30 @@
   VBoxNetAdp_DEBUG_INST.darwin= $(patsubst %/,%,$(INST_VBOXNETADP))
   VBoxNetAdp_NAME.solaris     = vboxnet
-  VBoxNetAdp_NAME.linux       = vboxnetadp
   VBoxNetAdp_NAME.freebsd     = vboxnetadp
   VBoxNetAdp_DEPS.solaris    += $(VBOX_SVN_REV_KMK)
   VBoxNetAdp_DEFS             = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
-  VBoxNetAdp_DEFS.linux       = KBUILD_MODNAME=KBUILD_STR\(vboxnetadp\) KBUILD_BASENAME=KBUILD_STR\(vboxnetadp\) MODULE
   #VBoxNetAdp_LDFLAGS.darwin   = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
   VBoxNetAdp_LDFLAGS.solaris += -N misc/gld -N drv/vboxdrv
-  VBoxNetAdp_INCS.linux   := \
-        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
   VBoxNetAdp_INCS             = \
         .
@@ -46 +42 @@
   VBoxNetAdp_SOURCES.solaris  = \
         solaris/VBoxNetAdp-solaris.c
-  VBoxNetAdp_SOURCES.linux   = \
-        linux/VBoxNetAdp-linux.c \
-        VBoxNetAdp.c
   VBoxNetAdp_SOURCES.freebsd   = \
         freebsd/VBoxNetAdp-freebsd.c \
@@ -57 +50 @@
   VBoxNetAdp_LIBS            += \
         $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-  linux/VBoxNetAdp-linux.c_DEPS = $(VBOX_SVN_REV_HEADER)
  endif
 endif

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -451 +451 @@
 endif #ifeq ($(KBUILD_TARGET), win)
 
-else if1of ($(KBUILD_TARGET), linux solaris freebsd) ## @todo merge this with the mixed case stuff.
+else if1of ($(KBUILD_TARGET), solaris freebsd) ## @todo merge this with the mixed case stuff.
 #
 # vboxnetflt(.ko/.o/) - The lower case driver.
@@ -461 +461 @@
   vboxnetflt_TEMPLATE      = VBOXR0DRV
   vboxnetflt_NAME.solaris  = vboxflt
-  vboxnetflt_DEFS.linux    = \
-        KBUILD_MODNAME=KBUILD_STR\(vboxnetflt\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxnetflt\) \
-        MODULE DEBUG_HASH=2 DEBUG_HASH2=3
   vboxnetflt_DEFS          = IN_RT_R0
   vboxnetflt_DEPS.solaris += $(VBOX_SVN_REV_KMK)
-  vboxnetflt_INCS.linux   := \
-        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
   vboxnetflt_INCS         := \
         $(PATH_SUB_CURRENT)
@@ -477 +471 @@
   #vboxnetflt_LIBS += \
   #     $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
-  vboxnetflt_SOURCES.linux = linux/VBoxNetFlt-linux.c
   vboxnetflt_SOURCES.solaris = solaris/VBoxNetFlt-solaris.c
   vboxnetflt_SOURCES.freebsd = freebsd/VBoxNetFlt-freebsd.c
   vboxnetflt_SOURCES = VBoxNetFlt.c
-  linux/VBoxNetFlt-linux.c_DEPS = $(VBOX_SVN_REV_HEADER)
   solaris/VBoxNetFlt-solaris.c_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 

trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk

@@ -18 +18 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), )
 
  ifdef VBOX_WITH_VBOXDRV
@@ -30 +30 @@
   VBoxPci_NAME.linux     = vboxpci
   VBoxPci_DEFS           = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
-  VBoxPci_DEFS.linux     = KBUILD_MODNAME=KBUILD_STR\(vboxpci\) KBUILD_BASENAME=KBUILD_STR\(vboxpci\) MODULE
-  VBoxPci_INCS.linux    := \
-        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
   VBoxPci_INCS           = \
         .
-  VBoxPci_SOURCES.linux  = \
-        linux/VBoxPci-linux.c
   VBoxPci_SOURCES        = \
         VBoxPci.c
   VBoxPci_LIBS          += \
         $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-  linux/VBoxPci-linux.c_DEPS = $(VBOX_SVN_REV_HEADER)
  endif
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1992 +1992 @@
 RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID
 RuntimeR0Drv_DEFS.win   = IN_SUP_R0 LDR_ONLY_PE
-RuntimeR0Drv_DEFS.linux = MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) IN_SUP_R0
 
 RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) include
 RuntimeR0Drv_INCS.freebsd = \
         $(PATH_STAGE)/gen-sys-hdrs
-RuntimeR0Drv_INCS.linux = \
-        r0drv/linux
 RuntimeR0Drv_INCS.solaris = \
         r0drv/solaris/vbi/i86pc \