VirtualBox

Changeset 14655 in vbox for trunk/src/VBox


Ignore:
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
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r14218 r14655  
    3636vboxadd-mod_MODE     = a+r,u+w
    3737vboxadd-mod_SOURCES  = $(subst ",,$(FILES_VBOXADD_NOBIN))
    38 vboxadd-mod_SOURCES += $(if $(VBOX_OSE),,$(PATH_vboxadd-mod)/dkms.conf)
     38vboxadd-mod_SOURCES += $(if $(VBOX_OSE),,\
     39                         $(PATH_vboxadd-mod)/dkms.conf \
     40                         $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
    3941vboxadd-mod_CLEAN    = $(PATH_vboxadd-mod)/dkms.conf
    4042
    … …  
    6567
    6668$$(PATH_vboxadd-sh)/build_in_tmp: \
    67                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
     69                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    6870                $(VBOX_VERSION_STAMP) \
    6971                | $$(dir $$@)

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

    r14079 r14655  
    44PACKAGE_VERSION=_VERSION_
    55AUTOINSTALL=yes
     6POST_BUILD="do_Module.symvers vboxadd save $dkms_tree/$module/$module_version/build/Module.symvers"

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

    r14078 r14655  
    3737vboxvfs-mod_MODE        = a+r,u+w
    3838vboxvfs-mod_SOURCES     = $(subst ",,$(FILES_VBOXVFS_NOBIN))
    39 vboxvfs-mod_SOURCES    += $(if $(VBOX_OSE),,$(PATH_vboxvfs-mod)/dkms.conf)
     39vboxvfs-mod_SOURCES    += $(if $(VBOX_OSE),,\
     40                            $(PATH_vboxvfs-mod)/dkms.conf \
     41                            $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
    4042vboxvfs-mod_CLEAN      += $(PATH_vboxvfs-mod)/dkms.conf
    4143
    … …  
    9395
    9496$$(PATH_vboxvfs-sh)/build_in_tmp: \
    95                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
     97                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    9698                $(VBOX_VERSION_STAMP) \
    9799                | $$(dir $$@)

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

    r14218 r14655  
    248248endif # eq($(MAKECMDGOALS),clean)
    249249
     250# important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
    250251clean:
    251252        for f in . linux r0drv r0drv/linux; do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
    252         rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Module.symvers Modules.symvers modules.order
     253        rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Modules.symvers modules.order

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

    r14079 r14655  
    44PACKAGE_VERSION=_VERSION_
    55AUTOINSTALL=yes
     6CLEAN="make -C $dkms_tree/$module/$module_version/build clean"
     7PRE_BUILD="do_Module.symvers vboxadd restore $dkms_tree/$module/$module_version/build/Module.symvers"

  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r14515 r14655  
    238238vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
    239239vboxdrv-mod_SOURCES += \
    240         $(if $(VBOX_OSE),,$(PATH_vboxdrv-mod)/dkms.conf) \
     240        $(if $(VBOX_OSE),,\
     241          $(PATH_vboxdrv-mod)/dkms.conf \
     242          $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers) \
    241243        $(PATH_vboxdrv-mod)/Makefile
    242244vboxdrv-mod_CLEAN   = \
    … …  
    256258
    257259$$(PATH_vboxdrv-sh)/build_in_tmp: \
    258                 $(PATH_SUB_CURRENT)/linux/build_in_tmp \
     260                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    259261                $(VBOX_VERSION_STAMP) \
    260262                | $$(dir $$@)

  • trunk/src/VBox/HostDrivers/Support/linux/dkms.conf

    r8447 r14655  
    44PACKAGE_VERSION=_VERSION_
    55AUTOINSTALL=yes
     6POST_BUILD="do_Module.symvers vboxdrv save $dkms_tree/$module/$module_version/build/Module.symvers"

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r14300 r14655  
    187187 VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
    188188 VBoxNetFlt-src_SOURCES+= \
    189         $(if $(VBOX_OSE),,$(PATH_VBoxNetFlt-src)/dkms.conf) \
     189        $(if $(VBOX_OSE),,\
     190          $(PATH_VBoxNetFlt-src)/dkms.conf \
     191          $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers) \
    190192        $(PATH_VBoxNetFlt-src)/Makefile
    191193 VBoxNetFlt-src_CLEAN   = \
    … …  
    215217
    216218$$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
    217                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
     219                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    218220                $(VBOX_VERSION_STAMP) \
    219221                | $$(dir $$@)

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

    r14436 r14655  
    267267endif # eq($(MAKECMDGOALS),clean)
    268268
     269# important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
    269270clean:
    270271        for f in . linux r0drv r0drv/linux VBox common/err common/string common/log generic math/gcc; \
    271272            do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
    272         rm -rf .vboxnetflt* .tmp_ver* vboxnetflt.* Module.symvers Modules.symvers modules.order
     273        rm -rf .vboxnetflt* .tmp_ver* vboxnetflt.* Modules.symvers modules.order

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/dkms.conf

    r14430 r14655  
    44PACKAGE_VERSION=_VERSION_
    55AUTOINSTALL=yes
     6CLEAN="make -C $dkms_tree/$module/$module_version/build clean"
     7PRE_BUILD="do_Module.symvers vboxdrv restore $dkms_tree/$module/$module_version/build/Module.symvers"

  • trunk/src/VBox/HostDrivers/linux/Makefile

    r14546 r14655  
    2929#
    3030
     31KBUILD_VERBOSE =
     32
    3133all:
    3234        @echo "*** Building 'vboxdrv' module ***"
    33         @$(MAKE) KBUILD_VERBOSE= -C vboxdrv
     35        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv
    3436        @cp vboxdrv/vboxdrv.ko .
    3537        @echo
    … …  
    3941            fi; \
    4042            echo "*** Building 'vboxnetflt' module ***"; \
    41             $(MAKE) KBUILD_VERBOSE= -C vboxnetflt; \
     43            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt; \
    4244            cp vboxnetflt/vboxnetflt.ko .; \
    4345        fi
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette