Changeset 52587 in vbox

Timestamp:

Sep 3, 2014 2:53:07 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95859

Message:

Makefile.kmk: be a bit more specific when building the Guest Additions

File:

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

trunk/Makefile.kmk

@@ -805 +805 @@
 # VM IP addresses.
 #
-VBOX_BLD_VM_LNX_X86_IP       := 192.168.27.2
 VBOX_BLD_VM_LNX_AMD64_IP     := 192.168.27.12
 VBOX_BLD_VM_LNX_NEW_X86_IP   := 192.168.27.11
@@ -826 +825 @@
  VBOX_BLD_VM_MSG_END__ =
 else
- VBOX_BLD_VM_MSG_BEGIN = @echo `date "+%Y-%m-%dT%H:%M:%S"` - Building $1.
+ VBOX_BLD_VM_MSG_BEGIN = @echo `date "+%Y-%m-%dT%H:%M:%S"` - Start building $1.
  VBOX_BLD_VM_MSG_END__ = @echo `date "+%Y-%m-%dT%H:%M:%S"` - Done building $1.
 endif
@@ -899 +898 @@
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
 else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions (build+pack))
         $(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 "
-        $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 additions)
+        $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 additions (build+pack))
 endif
 
@@ -909 +908 @@
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
 else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 additions (build.pack))
         $(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"
-        $(call VBOX_BLD_VM_MSG_END__,Windows/x86 additions)
+        $(call VBOX_BLD_VM_MSG_END__,Windows/x86 additions (build+pack))
 endif
 
@@ -934 +933 @@
 
 additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm
-        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 additions (build+pack))
         $(VBOX_KMK_TIME) ssh 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"
-        $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 additions)
-        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 additions)
+        $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 additions (build+pack))
+        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 additions (build+pack))
         $(VBOX_KMK_TIME) ssh 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"
-        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 additions)
+        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 additions (build+pack))
 
 additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it
@@ -969 +968 @@
 
 additions-build-os2.build-it: additions-build-os2.rsync-into-vm
-        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions (build+pack))
         $(VBOX_KMK_TIME) 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)
+        $(call VBOX_BLD_VM_MSG_END__,OS/2 additions (build+pack))
 
 additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
@@ -997 +996 @@
         $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions/greeter)
  endif
-        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions (build+pack))
         $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && 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)"
-        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions)
+        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions (build+pack))
 endif
 
@@ -1012 +1011 @@
         $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions/greeter)
  endif
-        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions (build+pack))
         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && 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)\""'
-        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions)
+        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions (build+pack))
 endif
 
@@ -1024 +1023 @@
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1
 else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions)
-        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && 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\""'
-        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions (combine))
+        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP "echo $@ && 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\""'
+        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions (combine))
 endif