Changeset 69531 in vbox

Timestamp:

Oct 30, 2017 5:59:26 PM (7 years ago)

Author:

vboxsync

Message:

Linux and FreeBSD drivers: use -src not -mod for all install rules.
bugref:4567: Linux kernel driver maintenance.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (2 diffs)
• Additions/linux/Makefile.kmk (modified) (1 diff)
• Additions/linux/drm/Makefile.kmk (modified) (1 diff)
• Additions/linux/sharedfolders/Makefile.kmk (modified) (1 diff)
• HostDrivers/Makefile.kmk (modified) (1 diff)
• HostDrivers/Support/Makefile.kmk (modified) (3 diffs)

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

@@ -211 +211 @@
  include $(PATH_SUB_CURRENT)/linux/files_vboxguest
  # sources and stuff.
- INSTALLS += vboxguest-mod
- vboxguest-mod_INST     = $(INST_ADDITIONS)src/vboxguest/
- vboxguest-mod_MODE     = a+r,u+w
- vboxguest-mod_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
+ INSTALLS += vboxguest-src
+ vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
+ vboxguest-src_MODE     = a+r,u+w
+ vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
 
  INSTALLS += vboxguest-scripts
@@ -235 +235 @@
  include $(PATH_SUB_CURRENT)/freebsd/files_vboxguest
  # sources and stuff.
- INSTALLS += vboxguest-mod
- vboxguest-mod_INST     = $(INST_ADDITIONS)src/vboxguest/
- vboxguest-mod_MODE     = a+r,u+w
- vboxguest-mod_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
+ INSTALLS += vboxguest-src
+ vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
+ vboxguest-src_MODE     = a+r,u+w
+ vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
 
 endif # FreeBSD

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

@@ -365 +365 @@
 
  ifneq ($(KERN_DIR),)
-  $(foreach module, vboxguest-mod vboxsf-mod vboxvideo-mod, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+  $(foreach module, vboxguest-src vboxsf-src vboxvideo-src, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
  endif
 

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

@@ -22 +22 @@
 # Populate FILES_VBOXVIDEO_DRM_NOBIN
 #
-INSTALLS += vboxvideo-mod
+INSTALLS += vboxvideo-src
 include $(PATH_SUB_CURRENT)/files_vboxvideo_drv
-vboxvideo-mod_DEPS         = \
+vboxvideo-src_DEPS         = \
         $(PATH_ROOT)/src/VBox/Additions/linux/drm/files_vboxvideo_drv \
         $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed
-vboxvideo-mod_INST         = $(INST_ADDITIONS)src/vboxvideo/
-vboxvideo-mod_SOURCES      = \
+vboxvideo-src_INST         = $(INST_ADDITIONS)src/vboxvideo/
+vboxvideo-src_SOURCES      = \
         $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN))
-vboxvideo-mod_EXEC_SOURCES = \
+vboxvideo-src_EXEC_SOURCES = \
         $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN))
-vboxvideo-mod_INSTALLER = $(RM_EXT) -f -- "$2" && \
+vboxvideo-src_INSTALLER = $(RM_EXT) -f -- "$2" && \
     $(if $(filter %.c %.h,$2),$(SED) -f $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed \
     --output "$2" "$1",$(CP_EXT) "$1" "$2") && \

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

@@ -23 +23 @@
 # Populate FILES_VBOXSF_NOBIN
 #
-INSTALLS += vboxsf-mod
+INSTALLS += vboxsf-src
 include $(PATH_SUB_CURRENT)/files_vboxsf
-vboxsf-mod_INST         = $(INST_ADDITIONS)src/vboxsf/
-vboxsf-mod_SOURCES      = \
+vboxsf-src_INST         = $(INST_ADDITIONS)src/vboxsf/
+vboxsf-src_SOURCES      = \
         $(subst $(DQUOTE),,$(FILES_VBOXSF_NOBIN))
-vboxsf-mod_EXEC_SOURCES = \
+vboxsf-src_EXEC_SOURCES = \
         $(subst $(DQUOTE),,$(FILES_VBOXSF_BIN))
 

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -78 +78 @@
 
  ifneq ($(KERN_DIR),)
-  $(foreach module, vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src VBoxPci-src, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+  $(foreach module, vboxdrv-src VBoxNetFlt-src VBoxNetAdp-src VBoxPci-src, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
  endif
 

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

@@ -58 +58 @@
   SYSMODS.os2     += VBoxDrv
  endif
- INSTALLS.linux   += vboxdrv-mod
- INSTALLS.freebsd += vboxdrv-mod
+ INSTALLS.linux   += vboxdrv-src
+ INSTALLS.freebsd += vboxdrv-src
 
  #
@@ -726 +726 @@
  # Targets for installing the linux sources.
  #
- vboxdrv-mod_INST    = bin/src/vboxdrv/
- vboxdrv-mod_SOURCES = \
+ vboxdrv-src_INST    = bin/src/vboxdrv/
+ vboxdrv-src_SOURCES = \
         $(subst $(DQUOTE),,$(FILES_VBOXDRV_NOBIN)) \
-        $(vboxdrv-mod_0_OUTDIR)/Makefile
- vboxdrv-mod_EXEC_SOURCES  = \
+        $(vboxdrv-src_0_OUTDIR)/Makefile
+ vboxdrv-src_EXEC_SOURCES  = \
         $(subst $(DQUOTE),,$(FILES_VBOXDRV_BIN))
- vboxdrv-mod_CLEAN   = \
-        $(vboxdrv-mod_0_OUTDIR)/Makefile \
-        $(PATH_TARGET)/vboxdrv-mod-1.dep \
+ vboxdrv-src_CLEAN   = \
+        $(vboxdrv-src_0_OUTDIR)/Makefile \
+        $(PATH_TARGET)/vboxdrv-src-1.dep \
 
  # Scripts needed for building the kernel modules
- includedep $(PATH_TARGET)/vboxdrv-mod-1.dep
- $$(vboxdrv-mod_0_OUTDIR)/Makefile: \
+ includedep $(PATH_TARGET)/vboxdrv-src-1.dep
+ $$(vboxdrv-src_0_OUTDIR)/Makefile: \
                 $(PATH_SUB_CURRENT)/$(KBUILD_TARGET)/Makefile \
                 $$(if $$(eq $$(Support/$(KBUILD_TARGET)/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
@@ -748 +748 @@
                  , -e "s;-DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" -e "s;-DIPRT_WITH_EFLAGS_AC_PRESERVING;;g",) \
                 --output $@ $<
-        %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/vboxdrv-mod-1.dep' \
+        %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/vboxdrv-src-1.dep' \
                 'Support/$(KBUILD_TARGET)/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
 endif # linux freebsd