Additions

Timestamp:

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

Author:

vboxsync

Message:

Additions/linux: revert r117404 for now.

bugref:8524: Additions/linux: play nicely with distribution-installed Additions

Location:

trunk/src/VBox/Additions

Files:

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

-              r68288
+              r68289
  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

-              r68288
+              r68289
 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"

-              r68288
+              r68289
 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"

Note: See TracChangeset for help on using the changeset viewer.