VirtualBox

Changeset 76653 in vbox


Ignore:
Timestamp:
Jan 6, 2019 3:42:37 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
127959
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r76649 r76653  
    966966#
    967967
     968
     969## Overridable ssh alias.
     970# On windows build boxes install https://github.com/PowerShell/Win32-OpenSSH/releases
     971# and point to it in LocalConfig.  (The cygwin ssh frequently segfaults due to
     972# termination race or something along those lines.)
     973VBOX_SSH ?= ssh
     974
     975## Overridable rsh alias.
     976VBOX_RSYNC ?= rsync --rsh="$(VBOX_SSH)"
     977
    968978##
    969979# The basic rsync invocation for syncing the tree into a VM; the source and
    … …  
    973983# @param    2   arch or *.
    974984#
    975 VBOX_RSYNC_IN_FN = rsync -a -v --delete --delete-excluded --prune-empty-dirs \
     985VBOX_RSYNC_IN_FN = $(VBOX_RSYNC) -a -v --delete --delete-excluded --prune-empty-dirs \
    976986        --exclude=*.pyc \
    977987        --exclude=.svn/ \
    … …  
    986996                --exclude=tools/$(os).x86/ \
    987997                --exclude=tools/$(os).amd64/ )
    988 
    989 ## Overridable ssh alias.
    990 # On windows build boxes install https://github.com/PowerShell/Win32-OpenSSH/releases
    991 # and point to it in LocalConfig.  (The cygwin ssh frequently segfaults due to
    992 # termination race or something along those lines.)
    993 VBOX_SSH ?= ssh
    994998
    995999#
    … …  
    11491153
    11501154additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it
    1151         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
    1152         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
     1155        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
     1156        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    11531157
    11541158.NOTPARALLEL: additions-build-solaris.rsync-into-vm
    … …  
    11831187additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
    11841188        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
    1185         $(TIME) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
     1189        $(TIME) -- $(VBOX_RSYNC) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
    11861190
    11871191.NOTPARALLEL: additions-build-os2.rsync-into-vm
    … …  
    12391243
    12401244additions-build-linux.rsync-out-of-vm: additions-build-linux.build-it
    1241         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86 out/
    1242         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1245        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86 out/
     1246        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    12431247
    12441248.NOTPARALLEL: additions-build-linux.rsync-into-vm
    … …  
    13321336
    13331337additions-build-darwin.amd64.rsync-out-of-vm: additions-build-darwin.amd64.build-it
    1334         $(TIME) -- rsync -a -v --delete $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
     1338        $(TIME) -- $(VBOX_RSYNC) -a -v --delete $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
    13351339
    13361340additions-build-darwin.x86.rsync-out-of-vm: additions-build-darwin.x86.build-it
    1337         $(TIME) -- rsync -a -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
     1341        $(TIME) -- $(VBOX_RSYNC) -a -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
    13381342
    13391343additions-build-darwin.amd64: additions-build-darwin.amd64.rsync-out-of-vm
    … …  
    14671471
    14681472extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
    1469         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
     1473        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    14701474
    14711475#.NOTPARALLEL: extpacks-build-solaris.rsync-into-vm
    … …  
    15041508
    15051509extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it
    1506         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/
    1507         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1510        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/
     1511        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    15081512
    15091513#.NOTPARALLEL: extpacks-build-linux.rsync-into-vm
    … …  
    15381542        $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
    15391543        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_109_AMD64_IP) 'PATH=$$PATH:/opt/local/bin; cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && KBUILD_HOST_ARCH=amd64 tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all '
    1540         $(TIME) -- rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
     1544        $(TIME) -- $(VBOX_RSYNC) -am -v --delete $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
    15411545        $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
    15421546endif
    … …  
    16691673
    16701674validationkit-build-solaris.rsync-out-of-vm: validationkit-build-solaris.build-it
    1671         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.x86   out/
    1672         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
     1675        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.x86   out/
     1676        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    16731677
    16741678.PHONY:       validationkit-build-solaris.rsync-out-of-vm validationkit-build-solaris.rsync-into-vm validationkit-build-solaris.build-it
    … …  
    16991703validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
    17001704        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
    1701         $(TIME) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
     1705        $(TIME) -- $(VBOX_RSYNC) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
    17021706
    17031707.PHONY:       validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it
    … …  
    17311735
    17321736validationkit-build-linux.rsync-out-of-vm: validationkit-build-linux.build-it
    1733         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.x86   out/
    1734         $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1737        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.x86   out/
     1738        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    17351739
    17361740.PHONY:       validationkit-build-linux.rsync-out-of-vm validationkit-build-linux.rsync-into-vm validationkit-build-linux.build-it
    … …  
    17641768        $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
    17651769        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) 'cd /Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all '
    1766         $(TIME) -- rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
     1770        $(TIME) -- $(VBOX_RSYNC) -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
    17671771        $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 Validation Kit)
    17681772endif
    … …  
    17751779        $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
    17761780        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) 'cd /Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all '
    1777         $(TIME) -- rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.x86 out/
     1781        $(TIME) -- $(VBOX_RSYNC) -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.x86 out/
    17781782        $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 Validation Kit)
    17791783endif
Note: See TracChangeset for help on using the changeset viewer.

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