Changeset 71575 in vbox

Timestamp:

Mar 29, 2018 3:25:50 PM (6 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: Try send in the cleanup crew before rsyncing in & out of the OS/2 VM.

File:

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

trunk/Makefile.kmk

@@ -1022 +1022 @@
 
 #
+# For killing old build jobs in the OS/2 VM before rsyncing.
+#
+VBOX_BLD_VM_OS2_KKILL_STUFF = $(REDIRECT_EXT) --stdin-pipe -- rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "kkill -All -Tree kmk.exe gcc.exe & sleep.exe 1 & kkill -All gcc.exe emxomfld.exe as.exe kmk.exe "
+
+
+#
 # Build the additions, all of them.
 #
@@ -1157 +1163 @@
  else
 additions-build-os2.rsync-into-vm:
+        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
         $(TIME_EXT) -- $(call VBOX_RSYNC_IN_FN,os2,*) \
                 '--exclude=src/VBox/Additions/x11/**' \
@@ -1170 +1177 @@
 
 additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
+        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
         $(TIME_EXT) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
 
@@ -1567 +1575 @@
 else # !OS/2
 validationkit-build-os2.rsync-into-vm:
+        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
         $(TIME_EXT) -- $(call VBOX_RSYNC_IN_FN,os2,*) \
                 '--exclude=src/VBox/Additions/x11/**' \
@@ -1580 +1589 @@
 
 validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
+        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
         $(TIME_EXT) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out