Changeset 32183 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Sep 1, 2010 3:53:42 PM (15 years ago)

Author:

vboxsync

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

65467

Message:

Linux Installer/Additions: attempt to properly register the host/guest kernel modules at DKMS and use the setup function of the service script to compile the modules instead of doing this separately in the installer scripts

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.kmk (modified) (3 diffs)
• Makefile.module (modified) (2 diffs)
• dkms.conf (deleted)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -34 +34 @@
 vboxvideo_drm-mod_MODE        = a+r,u+w
 vboxvideo_drm-mod_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_NOBIN))
-vboxvideo_drm-mod_SOURCES    += $(PATH_vboxvideo_drm-mod)/dkms.conf
-vboxvideo_drm-mod_CLEAN      += $(PATH_vboxvideo_drm-mod)/dkms.conf
 
 vboxvideo_drm-sh_INST        = $(INST_ADDITIONS)src/vboxvideo/
@@ -82 +80 @@
         $(QUIET)chmod 0755 $@
 
-$$(PATH_vboxvideo_drm-mod)/dkms.conf: \
-                $(PATH_SUB_CURRENT)/dkms.conf \
-                $(VBOX_VERSION_STAMP) \
-                | $$(dir $$@)
-        $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
-
 include $(KBUILD_PATH)/subfooter.kmk
 

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

@@ -4 +4 @@
 # (For 2.6.x this file must be 'Makefile'!)
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -150 +150 @@
  endif
  INCL    += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ INCL    += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include /r0drv/linux)
  export INCL
 endif