Changeset 71570 in vbox for trunk/Makefile.kmk

Timestamp:

Mar 29, 2018 1:00:58 PM (7 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: ditto for the validationkit.

File:

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

trunk/Makefile.kmk

@@ -1151 +1151 @@
  ifeq ($(KBUILD_TARGET),os2)
 additions-build-os2.x86:
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
+        + $(TIME_EXT) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(TIME_EXT) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
 
 additions-build-os2.rsync-into-vm:
@@ -1164 +1164 @@
                 . rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
 
-additions-build-os2.build-it: additions-build-os2.rsync-into-vm
+additions-build-os2.build-it: #additions-build-os2.rsync-into-vm
         $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions build+pack)
         $(TIME_EXT) -- rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
@@ -1563 +1563 @@
 ifeq ($(KBUILD_TARGET),os2)
 validationkit-build-os2.x86:
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+        + $(TIME_EXT) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
 validationkit-build-os2.rsync-into-vm:
 else # !OS/2
 validationkit-build-os2.rsync-into-vm:
-        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,os2,*) \
+        $(TIME_EXT) -- $(call VBOX_RSYNC_IN_FN,os2,*) \
                 '--exclude=src/VBox/Additions/x11/**' \
                 '--exclude=src/VBox/Additions/WINNT/**' \
@@ -1576 +1576 @@
 validationkit-build-os2.build-it: validationkit-build-os2.rsync-into-vm
         $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 Validation Kit)
-        $(VBOX_KMK_TIME) rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
+        $(TIME_EXT) -- rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
         $(call VBOX_BLD_VM_MSG_END__,OS/2 Validation Kit)
 
 validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
-        $(VBOX_KMK_TIME) rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
+        $(TIME_EXT) -- rsync -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