Changeset 32183 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/linux

Timestamp:

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

Author:

vboxsync

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/common/VBoxGuest/linux

Files:

• Makefile (modified) (2 diffs)
• dkms.conf (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2009 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -222 +222 @@
  endif
  INCL    += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ INCL    += $(addprefix -I$(KBUILD_EXTMOD)/vboxguest,/ /include /r0drv/linux)
  export INCL
 endif

trunk/src/VBox/Additions/common/VBoxGuest/linux/dkms.conf

@@ -1 @@
-BUILT_MODULE_NAME=vboxguest
-DEST_MODULE_LOCATION=/kernel/misc
-PACKAGE_NAME=vboxguest
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2010 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxguest"
 PACKAGE_VERSION=_VERSION_
 AUTOINSTALL=yes
-POST_BUILD="do_Module.symvers vboxguest save $dkms_tree/$module/$module_version/build/Module.symvers"
+
+BUILT_MODULE_NAME[0]="vboxguest"
+BUILT_MODULE_LOCATION[0]="vboxguest"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
+
+BUILT_MODULE_NAME[1]="vboxsf"
+BUILT_MODULE_LOCATION[1]="vboxsf"
+DEST_MODULE_LOCATION[1]="/kernel/misc"
+
+BUILT_MODULE_NAME[2]="vboxvideo"
+BUILT_MODULE_LOCATION[2]="vboxvideo"
+DEST_MODULE_LOCATION[2]="/kernel/misc"