Changeset 71576 in vbox
- Timestamp:
- Mar 29, 2018 4:15:58 PM (7 years ago)
- svn:sync-xref-src-repo-rev:
- 121556
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.kmk
r71575 r71576 919 919 920 920 # 921 # Alias for kmk_time. Used by both the additions and validation kit build setups.922 #923 ifeq ($(KBUILD_HOST),win)924 VBOX_KMK_TIME = $(KBUILD_BIN_PATH)/kmk_time$(HOSTSUFF_EXE) --unquoted --925 else926 VBOX_KMK_TIME = $(KBUILD_BIN_PATH)/kmk_time$(HOSTSUFF_EXE) --927 endif928 929 930 #931 921 # Combined package build (windows only). 932 922 # … … 1017 1007 VBOX_BLD_VM_MSG_END__ = 1018 1008 else 1019 VBOX_BLD_VM_MSG_BEGIN = @echo `date "+%Y-%m-%dT%H:%M:%S"` - Start building $1.1020 VBOX_BLD_VM_MSG_END__ = @echo `date "+%Y-%m-%dT%H:%M:%S"` - Done building $1.1009 VBOX_BLD_VM_MSG_BEGIN = @echo "$(date ) - Start building $1." 1010 VBOX_BLD_VM_MSG_END__ = @echo "$(date ) - Done building $1." 1021 1011 endif 1022 1012 … … 1095 1085 ifeq ($(KBUILD_TARGET),win) 1096 1086 additions-build-win.amd64-just-build: 1097 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)1087 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1098 1088 additions-build-win.amd64: additions-build-win.x86 additions-build-win.amd64-just-build 1099 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing1089 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing 1100 1090 else 1101 1091 additions-build-win.amd64: additions-build-win.x86 1102 1092 $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions build+pack) 1103 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing "1093 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) ' cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing ' 1104 1094 $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 additions build+pack) 1105 1095 endif … … 1107 1097 ifeq ($(KBUILD_TARGET),win) 1108 1098 additions-build-win.x86: 1109 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)1110 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing1099 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1100 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing 1111 1101 else 1112 1102 additions-build-win.x86: 1113 1103 $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 additions build.pack) 1114 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"1104 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) ' cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86) all packing ' 1115 1105 $(call VBOX_BLD_VM_MSG_END__,Windows/x86 additions build+pack) 1116 1106 endif … … 1119 1109 ifeq ($(KBUILD_TARGET),solaris) 1120 1110 additions-build-solaris.amd64: 1121 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)1122 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing1111 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1112 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing 1123 1113 1124 1114 additions-build-solaris.x86: additions-build-solaris.amd64 1125 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_ADD_HOST_BUILD_TWEAK)1126 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 packing1115 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_ADD_HOST_BUILD_TWEAK) 1116 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 packing 1127 1117 1128 1118 additions-build-solaris.rsync-into-vm: 1129 1119 else 1130 1120 additions-build-solaris.rsync-into-vm: 1131 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,solaris,*) \1121 $(TIME) -- $(call VBOX_RSYNC_IN_FN,solaris,*) \ 1132 1122 '--exclude=src/VBox/Additions/WINNT/**' \ 1133 1123 '--exclude=src/VBox/Frontends/**' \ … … 1137 1127 additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm 1138 1128 $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 additions build+pack) 1139 $( VBOX_KMK_TIME) ssh -v vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing"1129 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_SOLARIS_IP) ' cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing ' 1140 1130 $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 additions build+pack) 1141 1131 $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 additions build+pack) 1142 $( VBOX_KMK_TIME) ssh -v vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1"1132 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_SOLARIS_IP) ' cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 ' 1143 1133 $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 additions build+pack) 1144 1134 1145 1135 additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it 1146 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.x86 out/1147 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/1136 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.x86 out/ 1137 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/ 1148 1138 1149 1139 .NOTPARALLEL: additions-build-solaris.rsync-into-vm … … 1157 1147 ifeq ($(KBUILD_TARGET),os2) 1158 1148 additions-build-os2.x86: 1159 + $(TIME _EXT) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)1160 + $(TIME _EXT) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing1149 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1150 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing 1161 1151 1162 1152 additions-build-os2.rsync-into-vm: … … 1164 1154 additions-build-os2.rsync-into-vm: 1165 1155 -$(VBOX_BLD_VM_OS2_KKILL_STUFF) 1166 $(TIME _EXT) -- $(call VBOX_RSYNC_IN_FN,os2,*) \1156 $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*) \ 1167 1157 '--exclude=src/VBox/Additions/x11/**' \ 1168 1158 '--exclude=src/VBox/Additions/WINNT/**' \ … … 1173 1163 additions-build-os2.build-it: #additions-build-os2.rsync-into-vm 1174 1164 $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions build+pack) 1175 $(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"1165 $(TIME) -- $(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" 1176 1166 $(call VBOX_BLD_VM_MSG_END__,OS/2 additions build+pack) 1177 1167 1178 1168 additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it 1179 1169 -$(VBOX_BLD_VM_OS2_KKILL_STUFF) 1180 $(TIME _EXT) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out1170 $(TIME) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out 1181 1171 1182 1172 .NOTPARALLEL: additions-build-os2.rsync-into-vm … … 1193 1183 ifeq ($(KBUILD_TARGET),linux) 1194 1184 additions-build-linux.amd64: 1195 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)1196 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=11185 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1186 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 1197 1187 1198 1188 additions-build-linux.x86: 1199 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)1200 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=11189 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1190 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 1201 1191 1202 1192 additions-build-linux: additions-build-linux.x86 additions-build-linux.amd64 1203 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)1204 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=11193 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1194 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 1205 1195 else 1206 1196 additions-build-linux.rsync-into-vm: 1207 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,linux,*) \1197 $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) \ 1208 1198 '--exclude=src/VBox/Additions/WINNT/**' \ 1209 1199 '--exclude=src/VBox/Frontends/**' \ … … 1214 1204 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING 1215 1205 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions/greeter) 1216 $( VBOX_KMK_TIME) ssh '-v vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && dchroot -c ubuntu-11.10-amd64 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64/$(KBUILD_TYPE)/greeter VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter\""'1206 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_LNX_IP) 'dchroot -c ubuntu-11.10-amd64 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64/$(KBUILD_TYPE)/greeter VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter " ' 1217 1207 $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions/greeter) 1218 1208 endif 1219 1209 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions build+pack) 1220 $( VBOX_KMK_TIME) ssh '-v vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)\""'1210 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_LNX_IP) 'dchroot -c debian-4.0-amd64 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING) " ' 1221 1211 $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions build+pack) 1222 1212 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING 1223 1213 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions/greeter) 1224 $( VBOX_KMK_TIME) ssh '-v vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && linux32 dchroot -c ubuntu-11.10-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && BUILD_PLATFORM_ARCH=x86 tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86/$(KBUILD_TYPE)/greeter VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter\""'1214 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_LNX_IP) 'linux32 dchroot -c ubuntu-11.10-i386 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && BUILD_PLATFORM_ARCH=x86 tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86/$(KBUILD_TYPE)/greeter VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter " ' 1225 1215 $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions/greeter) 1226 1216 endif 1227 1217 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions build+pack) 1228 $( VBOX_KMK_TIME) ssh '-v vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)\""'1218 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_LNX_IP) 'linux32 dchroot -c rhel3-i386 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING) " ' 1229 1219 $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions build+pack) 1230 1220 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions combine) 1231 $( VBOX_KMK_TIME) ssh '-v vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1\""'1221 $(TIME) -- ssh -v vbox@$(VBOX_BLD_VM_LNX_IP) 'linux32 dchroot -c rhel3-i386 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 " ' 1232 1222 $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions combine) 1233 1223 1234 1224 additions-build-linux.rsync-out-of-vm: additions-build-linux.build-it 1235 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86 out/1236 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/1225 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86 out/ 1226 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/ 1237 1227 1238 1228 .NOTPARALLEL: additions-build-linux.rsync-into-vm … … 1327 1317 extpacks-build-win.amd64: 1328 1318 ifeq ($(KBUILD_TARGET),win) 1329 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1319 + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1330 1320 else 1331 1321 $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs) 1332 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"1322 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) 'cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all ' 1333 1323 $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs) 1334 1324 endif … … 1336 1326 extpacks-build-win.x86: 1337 1327 ifeq ($(KBUILD_TARGET),win) 1338 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1328 + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1339 1329 else 1340 1330 $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs) 1341 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"1331 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) 'cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all ' 1342 1332 $(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs) 1343 1333 endif … … 1345 1335 ifeq ($(KBUILD_TARGET),solaris) 1346 1336 extpacks-build-solaris.amd64: 1347 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1337 + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1348 1338 1349 1339 else 1350 1340 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both. 1351 1341 extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1352 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)1342 $(TIME) -- $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) 1353 1343 1354 1344 extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm 1355 1345 $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs) 1356 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"1346 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) 'cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all ' 1357 1347 $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs) 1358 1348 1359 1349 extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it 1360 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/1350 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/ 1361 1351 1362 1352 #.NOTPARALLEL: extpacks-build-solaris.rsync-into-vm … … 1368 1358 extpacks-build-os2.x86: 1369 1359 #ifeq ($(KBUILD_TARGET),os2) 1370 # + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1360 # + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1371 1361 #else 1372 # $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "1362 # $(TIME) -- ssh vbox@$(VBOX_BLD_VM_OS2_IP) ' cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) ' 1373 1363 #endif 1374 1364 1375 1365 ifeq ($(KBUILD_TARGET),linux) 1376 1366 extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1377 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1367 + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1378 1368 1379 1369 extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1380 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1370 + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1381 1371 1382 1372 extpacks-build-linux: extpacks-build-linux.x86 extpacks-build-linux.amd64 … … 1384 1374 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both. 1385 1375 extpacks-build-linux.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1386 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,linux,*) . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)1376 $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) 1387 1377 1388 1378 extpacks-build-linux.build-it: extpacks-build-linux.rsync-into-vm 1389 1379 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs) 1390 $( VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/amd64 && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all\""'1380 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_LNX_IP) 'dchroot -c debian-4.0-amd64 "cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all " ' 1391 1381 $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs) 1392 1382 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs) 1393 $( VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/x86 && linux32 dchroot -c debian-4.0-i386 \"cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all\""'1383 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_LNX_IP) 'linux32 dchroot -c debian-4.0-i386 "cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all " ' 1394 1384 $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs) 1395 1385 1396 1386 extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it 1397 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/1398 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/1387 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/ 1388 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/ 1399 1389 1400 1390 #.NOTPARALLEL: extpacks-build-linux.rsync-into-vm … … 1406 1396 extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1407 1397 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64) 1408 # + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1398 # + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1409 1399 #else 1410 1400 # $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs) 1411 # $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"1401 # $(TIME) -- ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) 'cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all ' 1412 1402 # $(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs) 1413 1403 #endif … … 1415 1405 extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1416 1406 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86) 1417 # + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1407 # + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1418 1408 #else 1419 1409 # $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs) 1420 # $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"1410 # $(TIME) -- ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) 'cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all ' 1421 1411 # $(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs) 1422 1412 #endif … … 1424 1414 extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) 1425 1415 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64) 1426 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)1416 + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) 1427 1417 else 1428 1418 $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs) 1429 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)1430 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"1431 $( VBOX_KMK_TIME)rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/1419 $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) 1420 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) 'cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all ' 1421 $(TIME) -- rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/ 1432 1422 $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs) 1433 1423 endif … … 1520 1510 validationkit-build-win.amd64: 1521 1511 ifeq ($(KBUILD_TARGET),win) 1522 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1512 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1523 1513 else 1524 1514 $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 Validation Kit) 1525 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all "1515 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) 'cd e:/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all ' 1526 1516 $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 Validation Kit) 1527 1517 endif … … 1529 1519 validationkit-build-win.x86: 1530 1520 ifeq ($(KBUILD_TARGET),win) 1531 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1521 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1532 1522 else 1533 1523 $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 Validation Kit) 1534 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"1524 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) 'cd e:/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all ' 1535 1525 $(call VBOX_BLD_VM_MSG_END__,Windows/x86 Validation Kit) 1536 1526 endif … … 1538 1528 ifeq ($(KBUILD_TARGET),solaris) 1539 1529 validationkit-build-solaris.amd64: 1540 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1530 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1541 1531 1542 1532 validationkit-build-solaris.x86: 1543 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1533 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1544 1534 1545 1535 else 1546 1536 validationkit-build-solaris.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST) 1547 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,solaris,*) \1537 $(TIME) -- $(call VBOX_RSYNC_IN_FN,solaris,*) \ 1548 1538 '--exclude=src/VBox/Additions/WINNT/**' \ 1549 1539 '--exclude=src/VBox/Frontends/**' \ … … 1553 1543 validationkit-build-solaris.build-it: validationkit-build-solaris.rsync-into-vm 1554 1544 $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 Validation Kit) 1555 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"1545 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) 'cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all ' 1556 1546 $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 Validation Kit) 1557 1547 $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 Validation Kit) 1558 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all "1548 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) 'cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all ' 1559 1549 $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 Validation Kit) 1560 1550 1561 1551 validationkit-build-solaris.rsync-out-of-vm: validationkit-build-solaris.build-it 1562 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.x86 out/1563 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/1552 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.x86 out/ 1553 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/ 1564 1554 1565 1555 .PHONY: validationkit-build-solaris.rsync-out-of-vm validationkit-build-solaris.rsync-into-vm validationkit-build-solaris.build-it … … 1571 1561 ifeq ($(KBUILD_TARGET),os2) 1572 1562 validationkit-build-os2.x86: 1573 + $(TIME _EXT) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1563 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1574 1564 validationkit-build-os2.rsync-into-vm: 1575 1565 else # !OS/2 1576 1566 validationkit-build-os2.rsync-into-vm: 1577 1567 -$(VBOX_BLD_VM_OS2_KKILL_STUFF) 1578 $(TIME _EXT) -- $(call VBOX_RSYNC_IN_FN,os2,*) \1568 $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*) \ 1579 1569 '--exclude=src/VBox/Additions/x11/**' \ 1580 1570 '--exclude=src/VBox/Additions/WINNT/**' \ … … 1585 1575 validationkit-build-os2.build-it: validationkit-build-os2.rsync-into-vm 1586 1576 $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 Validation Kit) 1587 $(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"1577 $(TIME) -- $(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" 1588 1578 $(call VBOX_BLD_VM_MSG_END__,OS/2 Validation Kit) 1589 1579 1590 1580 validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it 1591 1581 -$(VBOX_BLD_VM_OS2_KKILL_STUFF) 1592 $(TIME _EXT) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out1582 $(TIME) -- rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out 1593 1583 1594 1584 .PHONY: validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it … … 1599 1589 ifeq ($(KBUILD_TARGET),linux) 1600 1590 validationkit-build-linux.amd64: 1601 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1591 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1602 1592 1603 1593 validationkit-build-linux.x86: 1604 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1594 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1605 1595 1606 1596 validationkit-build-linux: validationkit-build-linux.x86 validationkit-build-linux.amd64 1607 1597 else 1608 1598 validationkit-build-linux.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST) 1609 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,linux,*) \1599 $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) \ 1610 1600 '--exclude=src/VBox/Additions/WINNT/**' \ 1611 1601 '--exclude=src/VBox/Frontends/**' \ … … 1615 1605 validationkit-build-linux.build-it: validationkit-build-linux.rsync-into-vm 1616 1606 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 Validation Kit) 1617 $( VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/amd64 && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all\""'1607 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_LNX_IP) 'dchroot -c debian-4.0-amd64 "cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all " ' 1618 1608 $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 Validation Kit) 1619 1609 $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 Validation Kit) 1620 $( VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/x86 && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all\""'1610 $(TIME) -- ssh vbox@$(VBOX_BLD_VM_LNX_IP) 'linux32 dchroot -c rhel3-i386 "cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all " ' 1621 1611 $(call VBOX_BLD_VM_MSG_END__,Linux/x86 Validation Kit) 1622 1612 1623 1613 validationkit-build-linux.rsync-out-of-vm: validationkit-build-linux.build-it 1624 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.x86 out/1625 $( VBOX_KMK_TIME)rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/1614 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.x86 out/ 1615 $(TIME) -- rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/ 1626 1616 1627 1617 .PHONY: validationkit-build-linux.rsync-out-of-vm validationkit-build-linux.rsync-into-vm validationkit-build-linux.build-it … … 1632 1622 validationkit-build-freebsd.amd64: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST) 1633 1623 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64) 1634 # + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1624 # + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1635 1625 #else 1636 1626 # $(call VBOX_BLD_VM_MSG_BEGIN,Freebsd/amd64 Validation Kit) 1637 # $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"1627 # $(TIME) -- ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) 'cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all ' 1638 1628 # $(call VBOX_BLD_VM_MSG_END__,Freebsd/amd64 Validation Kit) 1639 1629 #endif … … 1641 1631 validationkit-build-freebsd.x86: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST) 1642 1632 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86) 1643 # + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1633 # + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1644 1634 #else 1645 1635 # $(call VBOX_BLD_VM_MSG_BEGIN,Freebsd/x86 Validation Kit) 1646 # $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"1636 # $(TIME) -- ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) 'cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all ' 1647 1637 # $(call VBOX_BLD_VM_MSG_END__,Freebsd/x86 Validation Kit) 1648 1638 #endif … … 1650 1640 validationkit-build-darwin.amd64: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST) 1651 1641 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64) 1652 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1642 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1653 1643 else 1654 1644 $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 Validation Kit) 1655 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)1656 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"1657 $( VBOX_KMK_TIME)rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.amd64 out/1645 $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) 1646 $(TIME) -- 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 ' 1647 $(TIME) -- rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.amd64 out/ 1658 1648 $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 Validation Kit) 1659 1649 endif … … 1661 1651 validationkit-build-darwin.x86: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST) 1662 1652 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86) 1663 + $( VBOX_KMK_TIME)$(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)1653 + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK) 1664 1654 else 1665 1655 $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 Validation Kit) 1666 $( VBOX_KMK_TIME)$(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)1667 $( VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"1668 $( VBOX_KMK_TIME)rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.x86 out/1656 $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) 1657 $(TIME) -- 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 ' 1658 $(TIME) -- rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/darwin.x86 out/ 1669 1659 $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 Validation Kit) 1670 1660 endif
Note:
See TracChangeset
for help on using the changeset viewer.