Changeset 68288 in vbox for trunk/src/VBox

Timestamp:

Aug 3, 2017 2:48:20 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux: run the kernel module source files through indent.

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
In order to reduce the delta between in-kernel and our kernel modules, run
the source files through indent -linux when we copy them from our tree to
the Additions archive.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• linux/drm/Makefile.kmk (modified) (1 diff)
• linux/sharedfolders/Makefile.kmk (modified) (1 diff)

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

@@ -200 +200 @@
  vboxguest-src_MODE     = a+r,u+w
  vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
+ # The sed directive is because indent seems to have trouble with a macro
+ # invocation in assembly at the end of memuserkernel-r0drv-linux.c.
+ vboxguest-src_INSTALLER = $(RM_EXT) -f -- "$2" && \
+    $(if $(filter %.c %.h,$2),indent -linux -o "$2" "$1",$(CP_EXT) "$1" "$2") && \
+    $(SED) -i "s/_ASM_EXTABLE(1 b, 3 b)/_ASM_EXTABLE(1b, 3b)/g" "$2" && \
+    $(CHMOD_EXT) "$(if $(mode),$(mode),0644)" "$2"
 
  INSTALLS += vboxguest-scripts

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

@@ -29 +29 @@
 vboxvideo_drm-mod_EXEC_SOURCES = \
         $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN))
+vboxvideo_drm-mod_INSTALLER = $(RM_EXT) -f -- "$2" && \
+    $(if $(filter %.c %.h,$2),indent -linux -o "$2" "$1",$(CP_EXT) "$1" "$2") && \
+    $(CHMOD_EXT) "$(if $(mode),$(mode),0644)" "$2"
 
 

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

@@ -30 +30 @@
 vboxsf-mod_EXEC_SOURCES = \
         $(subst $(DQUOTE),,$(FILES_VBOXSF_BIN))
+vboxsf-mod_INSTALLER = $(RM_EXT) -f -- "$2" && \
+    $(if $(filter %.c %.h,$2),indent -linux -o "$2" "$1",$(CP_EXT) "$1" "$2") && \
+    $(CHMOD_EXT) "$(if $(mode),$(mode),0644)" "$2"