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

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

Files:

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

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -98 +98 @@
  vboxguest-src_MODE     = a+r,u+w
  vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
- vboxguest-src_SOURCES += $(vboxguest-sh_0_OUTDIR)/dkms.conf
- vboxguest-src_CLEAN    = $(vboxguest-sh_0_OUTDIR)/dkms.conf
+
+ INSTALLS += vboxguest-dkms-conf
+ vboxguest-dkms-conf_INST    = $(INST_ADDITIONS)src/
+ vboxguest-dkms-conf_MODE    = a+r,u+w
+ vboxguest-dkms-conf_SOURCES = $(vboxguest-sh_0_OUTDIR)/dkms.conf
+ vboxguest-dkms-conf_CLEAN   = $(vboxguest-sh_0_OUTDIR)/dkms.conf
+
+ INSTALLS += vboxguest-dkms-sh
+ vboxguest-dkms-sh_INST    = $(INST_ADDITIONS)src/
+ vboxguest-dkms-sh_MODE    = a+rx,u+w
+ vboxguest-dkms-sh_SOURCES = $(vboxguest-sh_0_OUTDIR)/do_dkms
+ vboxguest-dkms-sh_CLEAN   = $(vboxguest-sh_0_OUTDIR)/do_dkms
 
  $$(vboxguest-sh_0_OUTDIR)/dkms.conf: \
@@ -106 +116 @@
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
+        $(QUIET)$(SED) \
+                -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
+                --output $@ $<
+
+ $$(vboxguest-sh_0_OUTDIR)/do_dkms: \
+                $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_dkms \
+                $(VBOX_VERSION_STAMP) \
+                | $$(dir $$@)
+        $(call MSG_TOOL,Creating,,$@)
+        $(QUIET)$(SED) \
+                -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
+                -e "s;_MODULE_;vboxguest;g" \
+                -e "s;_OLDMODULES_;vboxguest vboxadd vboxsf vboxvfs vboxvideo;g" \
+                --output $@ $<
 
  # scripts.

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"