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

Timestamp:

Nov 26, 2008 5:45:21 PM (16 years ago)

Author:

vboxsync

Message:

Linux drivers: try to hack around the DKMS problem with module dependencies

Location:

trunk/src/VBox/Additions/linux

Files:

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

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

@@ -36 +36 @@
 vboxadd-mod_MODE     = a+r,u+w
 vboxadd-mod_SOURCES  = $(subst ",,$(FILES_VBOXADD_NOBIN))
-vboxadd-mod_SOURCES += $(if $(VBOX_OSE),,$(PATH_vboxadd-mod)/dkms.conf)
+vboxadd-mod_SOURCES += $(if $(VBOX_OSE),,\
+                         $(PATH_vboxadd-mod)/dkms.conf \
+                         $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
 vboxadd-mod_CLEAN    = $(PATH_vboxadd-mod)/dkms.conf
 
@@ -65 +67 @@
 
 $$(PATH_vboxadd-sh)/build_in_tmp: \
-                $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
+                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
                 | $$(dir $$@)

trunk/src/VBox/Additions/linux/module/dkms.conf

@@ -4 +4 @@
 PACKAGE_VERSION=_VERSION_
 AUTOINSTALL=yes
+POST_BUILD="do_Module.symvers vboxadd save $dkms_tree/$module/$module_version/build/Module.symvers"

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

@@ -37 +37 @@
 vboxvfs-mod_MODE        = a+r,u+w
 vboxvfs-mod_SOURCES     = $(subst ",,$(FILES_VBOXVFS_NOBIN))
-vboxvfs-mod_SOURCES    += $(if $(VBOX_OSE),,$(PATH_vboxvfs-mod)/dkms.conf)
+vboxvfs-mod_SOURCES    += $(if $(VBOX_OSE),,\
+                            $(PATH_vboxvfs-mod)/dkms.conf \
+                            $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
 vboxvfs-mod_CLEAN      += $(PATH_vboxvfs-mod)/dkms.conf
 
@@ -93 +95 @@
 
 $$(PATH_vboxvfs-sh)/build_in_tmp: \
-                $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
+                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
                 | $$(dir $$@)

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

@@ -248 +248 @@
 endif # eq($(MAKECMDGOALS),clean)
 
+# important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
 clean:
         for f in . linux r0drv r0drv/linux; do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
-        rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Module.symvers Modules.symvers modules.order
+        rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Modules.symvers modules.order

trunk/src/VBox/Additions/linux/sharedfolders/dkms.conf

@@ -4 +4 @@
 PACKAGE_VERSION=_VERSION_
 AUTOINSTALL=yes
+CLEAN="make -C $dkms_tree/$module/$module_version/build clean"
+PRE_BUILD="do_Module.symvers vboxadd restore $dkms_tree/$module/$module_version/build/Module.symvers"