Changeset 71573 in vbox for trunk/Makefile.kmk

Timestamp:

Mar 29, 2018 3:07:33 PM (7 years ago)

Author:

vboxsync

Message:

kBuild 3209 -> 3212: Added --stdin-pipe option to kmk_redirect for working around rsh.exe issue on windows (doesn't like stdin=nul). Applied this to the two rsh uses in /Makefile.kmk. Fixed double newline conversion in the job output buffering (EOL mostly ended up as \r\r\n).

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.kmk (modified) (2 diffs)

trunk/Makefile.kmk

@@ -1166 +1166 @@
 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"
+        $(TIME_EXT) -- $(REDIRECT_EXT) --stdin-pipe -- 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"
         $(call VBOX_BLD_VM_MSG_END__,OS/2 additions build+pack)
 
@@ -1576 +1576 @@
 validationkit-build-os2.build-it: validationkit-build-os2.rsync-into-vm
         $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 Validation Kit)
-        $(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"
+        $(TIME_EXT) -- $(REDIRECT_EXT) --stdin-pipe -- 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)