Changeset 66071 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Mar 13, 2017 8:04:04 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113940

Message:

Additions/linux: remove more hacks

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/Makefile.kmk (modified) (1 diff)
• sharedfolders/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/Makefile.kmk

@@ -31 +31 @@
 
 
-#
-# The kernel module.
-#
-# Note! Syntax checking only.  Don't bother if drmP.h is missing (introduced
-#       in 2.6.27).  For the mode-setting driver make sure this is supported.
-# Note! The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels.
-#
-if defined(VBOX_WITH_ADDITION_DRIVERS)
- if "$(shell grep -s 'DRM_IOCTL_MODE_CURSOR2' $(foreach inc,$(VBOX_LINUX_INCS),$(inc)/uapi/drm/drm.h))" != ""
-  SYSMODS += vboxvideo_drm
- endif
-endif
-
-vboxvideo_drm_TEMPLATE        = VBOXGUESTR0
-vboxvideo_drm_CFLAGS          = -fshort-wchar
-vboxvideo_drm_DEFS            = \
-        MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
-        KBUILD_MODNAME=KBUILD_STR\(vboxvideo\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxvideo\) \
-        DEBUG_HASH=2 DEBUG_HASH2=3
-vboxvideo_drm_INCS           += \
-  ../../../Runtime/include \
-  ../../../Runtime/r0drv/linux \
-  $(VBOX_GRAPHICS_INCS)
-vboxvideo_drm_SOURCES         = \
-  ../../common/VBoxVideo/HGSMIBase.cpp \
-  ../../common/VBoxVideo/Modesetting.cpp \
-  ../../common/VBoxVideo/VBVABase.cpp \
-  ../../../GuestHost/HGSMI/HGSMICommon.cpp \
-  ../../../GuestHost/HGSMI/HGSMIMemAlloc.cpp \
-  ../../../Runtime/common/alloc/heapoffset.cpp \
-        vbox_drv.c \
-        vbox_fb.c \
-        vbox_irq.c \
-        vbox_main.c \
-        vbox_mode.c \
-        vbox_ttm.c
-
-vbox_drv.c_DEPS               = $(VBOX_SVN_REV_HEADER)
 
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -33 +33 @@
 
 #
-# The module (for syntax checking).
-# The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels
-#
-ifdef VBOX_WITH_ADDITION_DRIVERS
- SYSMODS += vboxsf
- vboxsf_TEMPLATE        = VBOXGUESTR0
- vboxsf_CFLAGS          = -fshort-wchar
- vboxsf_DEFS            = \
-        MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
-        KBUILD_MODNAME=KBUILD_STR\(vboxsf\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxsf\) \
-        DEBUG_HASH=2 DEBUG_HASH2=3
- # detect fc6 2.6.18
- vboxsf_DEFS           += \
-        $(foreach inc, $(VBOX_LINUX_INCS),\
-                $(if $(wildcard $(inc)/linux/utsrelease.h),\
-                  $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
-                               then echo yes; fi),KERNEL_FC6,),))
- # detect rhel5 2.6.18
- vboxsf_DEFS           += \
-        $(foreach inc, $(VBOX_LINUX_INCS),\
-                $(if $(wildcard $(inc)/linux/utsrelease.h),\
-                  $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
-                               then echo yes; fi),KERNEL_FC6,),))
-
- vboxsf_INCS            = \
-        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
- vboxsf_SOURCES         = \
-        vfsmod.c \
-        utils.c \
-        dirops.c \
-        lnkops.c \
-        regops.c
- vboxsf_LIBS            = \
-        $(VBOX_LIB_VBGL_R0)
-
-vfsmod.c_DEPS           = $(VBOX_SVN_REV_HEADER)
-endif
-
-#
 # The mount util.
 #