Changeset 68306 in vbox for trunk

Timestamp:

Aug 6, 2017 2:52:30 PM (7 years ago)

Author:

vboxsync

Message:

Additions/Linux/vboxvideo: adjust some file names to match kernel ones.

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Adjusting the file names in our Additions installer makes it easier to check
differences between in-kernel vboxvideo and our version.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.module.kms (modified) (1 diff)
• files_vboxvideo_drv (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -35 +35 @@
 MOD_NAME   = vboxvideo
 
-MOD_OBJS   = HGSMIBase.o \
-             Modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
-             vbox_mode.o vbox_ttm.o VBVABase.o vbox_prime.o vbox_hgsmi.o
+MOD_OBJS   = hgsmi_base.o \
+             modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
+             vbox_mode.o vbox_ttm.o vbva_base.o vbox_prime.o vbox_hgsmi.o
 
 MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
 MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
 # What on earth is this?
-MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
+# MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
 MOD_INCL  += -Iinclude/drm
 MOD_DEFS  := -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -21 +21 @@
     ${PATH_OUT}/revision-generated.h=>revision-generated.h \
     ${PATH_OUT}/product-generated.h=>product-generated.h \
-    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \
-    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChannels.h=>include/HGSMIChannels.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChSetup.h=>include/HGSMIChSetup.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMIContext.h=>include/HGSMIContext.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>include/HGSMIDefs.h \
-    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>include/VBoxVideoVBE.h \
-    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
-    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBuffers.cpp=>HGSMIBuffers.c \
-    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \
-    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp=>VBVABase.c \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>VBoxVideo.h \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>VBoxVideoGuest.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChannels.h=>HGSMIChannels.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChSetup.h=>HGSMIChSetup.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIContext.h=>HGSMIContext.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>HGSMIDefs.h \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>VBoxVideoVBE.h \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>hgsmi_base.c \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>modesetting.c \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp=>vbva_base.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/HGSMIBase.h=>include/HGSMIBase.h \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h=>include/VBoxVideoIPRT.h \