Changeset 76659 in vbox

Timestamp:

Jan 6, 2019 6:56:10 PM (6 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: Make rsync use the same ssh as we do for the command execution. [fix]

File:

• trunk/Makefile.kmk (modified) (6 diffs)

trunk/Makefile.kmk

@@ -975 +975 @@
 
 ## Overridable rsh name.
-VBOX_RSYNC ?= rsync --rsh="$(VBOX_SSH_FOR_RSYNC)"
+VBOX_RSYNC     ?= rsync --rsh="$(VBOX_SSH_FOR_RSYNC)"
+VBOX_RSYNC_RSH ?= rsync
 
 ##
@@ -983 +984 @@
 # @param    1   os name.
 # @param    2   arch or *.
-#
-VBOX_RSYNC_IN_FN = $(VBOX_RSYNC) -a -v --delete --delete-excluded --prune-empty-dirs \
+# @param    3   rsh or empty
+#
+VBOX_RSYNC_IN_FN = $(if-expr "$(3)" != "rsh",$(VBOX_RSYNC),$(VBOX_RSYNC_RSH))\
+        -a -v --delete --delete-excluded --prune-empty-dirs \
         --exclude=*.pyc \
         --exclude=.svn/ \
@@ -1174 +1177 @@
 additions-build-os2.rsync-into-vm:
         -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
-        $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*) \
+        $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*,rsh)\
                 '--exclude=src/VBox/Additions/x11/**' \
                 '--exclude=src/VBox/Additions/WINNT/**' \
@@ -1188 +1191 @@
 additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
         -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
-        $(TIME) -- $(VBOX_RSYNC) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
+        $(TIME) -- $(VBOX_RSYNC_RSH) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
 
 .NOTPARALLEL: additions-build-os2.rsync-into-vm
@@ -1690 +1693 @@
 validationkit-build-os2.rsync-into-vm:
         -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
-        $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*) \
+        $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*,rsh) \
                 '--exclude=src/VBox/Additions/x11/**' \
                 '--exclude=src/VBox/Additions/WINNT/**' \
@@ -1704 +1707 @@
 validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
         -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
-        $(TIME) -- $(VBOX_RSYNC) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
+        $(TIME) -- $(VBOX_RSYNC_RSH) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
 
 .PHONY:       validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it