VirtualBox

Changeset 6693 in vbox


Ignore:
Timestamp:
Jan 31, 2008 10:22:17 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
27767
Message:

Replaced VBOXLNX32GUESTR0 by VBOXGUESTR0, VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 by VBOX_WITH_ADDITION_DRIVERS, RuntimeLnx32GuestR0 by RuntimeW32GuestR0, and VBoxGuestLib[Base]Linux to VBoxGuestR0Lib[Base].

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r6686 r6693  
    144144 VBOX_WITH_ADDITIONS = 1
    145145endif
     146# Build the optional ring-0 part of the additions for syntax checking.
     147# (Ignored ifndef VBOX_WITH_ADDITIONS. Hack for 32/64 linux issues.)
     148VBOX_WITH_ADDITION_DRIVERS = 1
    146149# Build win32 additions (cross building them on linux and l4 using wine).
    147150if1of ($(BUILD_TARGET),l4 linux win)
    … …  
    149152endif
    150153# Build linux additions.
    151 # Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only VBOX_WITH_WIN32_ADDITIONS will
    152 # be kept around for cross building. That is, unless it is really needed for l4 development (the
    153 # build server will fetch the .iso from the additions build box).
     154# Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only
     155# VBOX_WITH_WIN32_ADDITIONS will be kept around for cross building.
    154156if1of ($(BUILD_TARGET),l4 linux)
    155157 VBOX_WITH_LINUX_ADDITIONS = 1
    156  ifeq ($(BUILD_TARGET).$(BUILD_PLATFORM_ARCH),linux.x86)
    157   VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 = 1
    158  endif
    159158endif
    160159# Enable the building of shared folders in the windows additions.
    … …  
    25672566
    25682567#
    2569 # Template for syntax checking the linux guest additions.
    2570 # Not properly realized yet.
    2571 #
    2572 TEMPLATE_VBOXLNX32GUESTR0         = Template for *syntax checking* linux guest additions kernel modules
    2573 TEMPLATE_VBOXLNX32GUESTR0_TOOL    = $(VBOX_GCC_TOOL)
    2574 TEMPLATE_VBOXLNX32GUESTR0_BLD_TRG = linux
    2575 TEMPLATE_VBOXLNX32GUESTR0_DEFS    = __KERNEL__ MODULE IN_GUEST IN_GUEST_R0 IN_RING0 IN_RT_R0
    2576 TEMPLATE_VBOXLNX32GUESTR0_INCS    = $(VBOX_LINUX_INCS)
    2577 TEMPLATE_VBOXLNX32GUESTR0_CFLAGS  = -nostdinc -iwithprefix include \
    2578         -O2 -Wall -Wstrict-prototypes -Wno-trigraphs $(VBOX_GCC_Wno-pointer-sign) \
    2579         $(VBOX_GCC_fno-stack-protector) -fno-strict-aliasing -fno-common \
    2580         -mpreferred-stack-boundary=2 -msoft-float
    2581 TEMPLATE_VBOXLNX32GUESTR0_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign,$(TEMPLATE_VBOXLNX32GUESTR0_CFLAGS)) -fno-exceptions -fno-rtti
    2582 ifndef VBOX_LINUX_VERSION_2_4
    2583 # 2.6
    2584 TEMPLATE_VBOXLNX32GUESTR0_SYSSUFF = .ko
    2585 TEMPLATE_VBOXLNX32GUESTR0_LDFLAGS = -m elf_i386 -r
    2586 else
    2587 # 2.4
    2588 TEMPLATE_VBOXLNX32GUESTR0_SYSSUFF = .o
    2589 TEMPLATE_VBOXLNX32GUESTR0_LDFLAGS = -r -s
    2590 endif
    2591 
    2592 
    2593 #
    25942568# Templates for building 32-bit linux guest additions.
    25952569#
    … …  
    27812755TEMPLATE_VBOXGUESTR0_EXTENDS    = VBOXR0DRV
    27822756TEMPLATE_VBOXGUESTR0_INST       = $(INST_ADDITIONS)
    2783 TEMPLATE_VBOXGUESTR0_BLD_TRG_ARCH   = x86
    2784 TEMPLATE_VBOXGUESTR0_BLD_TRG_CPU    = blend
    27852757TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = WIN32SDK W2K3DDKX86
    27862758TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS
    2787 TEMPLATE_VBOXGUESTR0_DEFS       = $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS)) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32
     2759ifn1of ($(BUILD_TARGET),l4 linux) # must be same as the host.
     2760 TEMPLATE_VBOXGUESTR0_DEFS      = $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS)) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32
     2761 TEMPLATE_VBOXGUESTR0_BLD_TRG_ARCH = x86
     2762 TEMPLATE_VBOXGUESTR0_BLD_TRG_CPU = blend
     2763else
     2764 TEMPLATE_VBOXGUESTR0_DEFS      = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0
     2765endif
    27882766ifeq ($(BUILD_TARGET),l4) # cross building linux on l4.
    27892767 TEMPLATE_VBOXGUESTR0_BLD_TRG   = linux

  • trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

    r6662 r6693  
    2020include $(PATH_KBUILD)/subheader.kmk
    2121
     22#
     23# Target config.
     24#
    2225ifn1of ($(BUILD_TARGET),l4 linux win)
    2326 LIBRARIES += \
    … …  
    4548 endif
    4649 ifdef VBOX_WITH_LINUX_ADDITIONS
    47   ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    4850   LIBRARIES += \
    49         VBoxGuestLibLinux \
    50         VBoxGuestLibBaseLinux
    51   endif
    52    LIBRARIES += \
     51        VBoxGuestR0Lib \
     52        VBoxGuestR0LibBase \
    5353        VBoxGuestR3Lib \
    5454        VBoxGuestR3LibShared \
    … …  
    5757 endif
    5858endif
     59
     60ifndef VBOX_WITH_ADDITION_DRIVERS
     61 if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
     62  LIBRARIES := $(filter-out VBoxGuestR0Lib VBoxGuestR0LibBase, $(LIBRARIES))
     63 endif
     64endif
     65
    5966
    6067#
    … …  
    170177
    171178#
    172 # VBoxGuestLibLinux
    173 #
    174 VBoxGuestLibLinux_TEMPLATE  = VBOXLNX32GUESTR0
    175 VBoxGuestLibLinux_SOURCES   = $(VBoxGuestR0Lib_SOURCES)
    176 VBoxGuestLibLinux_INCS      = $(VBoxGuestLib_INCS)
    177 VBoxGuestLibLinux_DEFS      = VBOX_HGCM LOG_TO_BACKDOOR
    178 
    179 
    180 #
    181 # VBoxGuestLibBaseLinux
    182 #
    183 VBoxGuestLibBaseLinux_TEMPLATE = VBOXLNX32GUESTR0
    184 VBoxGuestLibBaseLinux_SOURCES  = $(VBoxGuestR0LibBase_SOURCES)
    185 VBoxGuestLibBaseLinux_INCS     = $(VBoxGuestLib_INCS)
    186 VBoxGuestLibBaseLinux_DEFS     = VBOX_HGCM VBGL_VBOXGUEST LOG_TO_BACKDOOR
    187 
    188 #
    189179# VBoxGuestR3LibLinux
    190180#

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

    r5999 r6693  
    2020
    2121INSTALLS = vboxmod-bin vboxmod-sh
    22 ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    23 SYSMODS = vboxadd
     22ifdef VBOX_WITH_ADDITION_DRIVERS
     23 SYSMODS = vboxadd
    2424endif
    2525
    … …  
    4040# The module (for syntax checking).
    4141#
    42 vboxadd_TEMPLATE = VBOXLNX32GUESTR0
    43 vboxadd_DEFS     = KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM
    44 vboxadd_LIBS     = $(PATH_LIB)/VBoxGuestLibBaseLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
    45 vboxadd_SOURCES  = vboxmod.c cmc.c hgcmcall.c
     42vboxadd_TEMPLATE = VBOXGUESTR0
     43vboxadd_NOINST   = 1
     44vboxadd_DEFS     = \
     45        MODULE IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM \
     46        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
     47        KBUILD_BASENAME=KBUILD_STR\(vboxadd\)
    4648vboxadd_INCS     = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
    47 vboxadd_NOINST   = 1
     49vboxadd_SOURCES  = \
     50        vboxmod.c \
     51        cmc.c \
     52        hgcmcall.c
     53vboxadd_LIBS     = \
     54        $(VBOX_LIB_VBGL_R0BASE) \
     55        $(VBOX_LIB_IPRT_GUEST_R0)
    4856
    4957include $(PATH_KBUILD)/footer.kmk

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r5999 r6693  
    1919include $(PATH_KBUILD)/header.kmk
    2020
    21 ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    22 SYSMODS  = vboxvfs
     21ifdef VBOX_WITH_ADDITION_DRIVERS
     22 SYSMODS  = vboxvfs
    2323endif
    2424PROGRAMS = mountvboxsf
    … …  
    4444# The module (for syntax checking).
    4545#
    46 vboxvfs_TEMPLATE        = VBOXLNX32GUESTR0
    47 vboxvfs_DEFS           := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
    48                           KBUILD_BASENAME=KBUILD_STR\(vboxadd\) \
    49                           MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
    50 vboxvfs_LIBS            = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
     46vboxvfs_TEMPLATE        = VBOXGUESTR0
     47vboxvfs_NOINST          = 1
     48vboxvfs_CFLAGS          = -fshort-wchar
     49vboxvfs_DEFS            = \
     50        MODULE IN_RT_R0 VBOXGUEST VBOX_HGCM \
     51        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
     52        KBUILD_BASENAME=KBUILD_STR\(vboxadd\)
     53vboxvfs_INCS            = \
     54        ../../common/VBoxGuestLib \
     55        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
    5156vboxvfs_SOURCES         = \
    5257        vfsmod.c \
    … …  
    5459        dirops.c \
    5560        regops.c
    56 vboxvfs_NOINST          = 1
    57 vboxvfs_CFLAGS         += -fshort-wchar
    58 vboxvfs_INCS           += \
    59         ../../common/VBoxGuestLib \
    60         $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
     61vboxvfs_LIBS            = \
     62        $(VBOX_LIB_VBGL_R0) \
     63        $(VBOX_LIB_IPRT_GUEST_R0)
    6164
    6265# detect fc6 2.6.18
    … …  
    7679#
    7780mountvboxsf_TEMPLATE    = VBOXLNX32GUESTR3EXENOCPP
     81mountvboxsf_DEFS        = _GNU_SOURCE
    7882mountvboxsf_SOURCES     = \
    7983        vbsfmount.h \
    8084        mount.vboxsf.c
    81 mountvboxsf_DEFS        = _GNU_SOURCE
    8285
    8386

  • trunk/src/VBox/Runtime/Makefile.kmk

    r6685 r6693  
    3333 # Only build the additions, sort out the legacy names first.
    3434 #
    35  ifeq ($(BUILD_TARGET),linux)
    36   LIBRARIES  = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeGuestR3 RuntimeGuestR3Mini
    37  else ifeq ($(BUILD_TARGET),win)
     35 ifeq ($(BUILD_TARGET),win)
    3836  LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    3937 else
    … …  
    4139  #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
    4240  #LIBRARIES.win = RuntimeW32NT4GuestR0
     41  if1of ($(BUILD_TARGET), linux l4) ## @todo eliminate this.
     42   LIBRARIES += RuntimeLnx32GuestR3
     43  endif
     44  ifndef VBOX_WITH_ADDITION_DRIVERS
     45   if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
     46    LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES))
     47   endif
     48  endif
    4349 endif
    4450
    4551 #
    4652 # Remote cross building... Will be removed unless somebody speaks up!
     53 ## @todo Remove this tomorrow.
    4754 #
    4855else ifdef VBOX_ADDITIONS_LINUX_ONLY
    49  LIBRARIES  = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeGuestR3 RuntimeGuestR3Mini
     56 LIBRARIES  = RuntimeLnx32GuestR3 \
     57        RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    5058else ifdef VBOX_ADDITIONS_WIN32_ONLY
    5159 LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    … …  
    6169 endif
    6270 ifdef VBOX_WITH_ADDITIONS
    63   if1of ($(BUILD_TARGET),linux l4 win)
    64    ifdef VBOX_WITH_WIN32_ADDITIONS
    65     LIBRARIES += RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
     71  ifdef VBOX_WITH_WIN32_ADDITIONS
     72   LIBRARIES += RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
     73  endif
     74  ifneq ($(BUILD_TARGET),win)
     75   LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
     76   #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
     77   #LIBRARIES.win = RuntimeW32NT4GuestR0
     78   ifdef VBOX_WITH_LINUX_ADDITIONS ## @todo eliminate this ASAP
     79    LIBRARIES += RuntimeLnx32GuestR3
    6680   endif
    67    ifdef VBOX_WITH_LINUX_ADDITIONS
    68     LIBRARIES += RuntimeLnx32GuestR3 RuntimeGuestR3 RuntimeGuestR3Mini
    69     ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    70      LIBRARIES += RuntimeLnx32GuestR0
     81   ifndef VBOX_WITH_ADDITION_DRIVERS
     82    if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
     83     LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES))
    7184    endif
    7285   endif
    73   else
    74    LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    75    #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
    7686  endif
    7787 endif # VBOX_WITH_ADDITIONS
    … …  
    10671077
    10681078#
    1069 # RuntimeLnx32GuestR0 - 32-bit Linux guest driver runtime.
    1070 #
    1071 ## @todo remove this and use RuntimeGuestR0.
    1072 RuntimeLnx32GuestR0_TEMPLATE      = VBOXLNX32GUESTR0
    1073 RuntimeLnx32GuestR0_DEFS          = RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0 \
    1074                                     MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\)
    1075 RuntimeLnx32GuestR0_INCS          = $(RuntimeR0Drv_INCS.linux) $(RuntimeR0Drv_INCS)
    1076 RuntimeLnx32GuestR0_SOURCES       = \
    1077         $(RuntimeR0Drv_SOURCES) \
    1078         $(RuntimeR0Drv_SOURCES.linux) \
    1079         VBox/logbackdoor.cpp
    1080 
    1081 
    1082 #
    10831079# RuntimeGC - Guest context library.
    10841080#
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette