Changeset 31134 in vbox

Timestamp:

Jul 27, 2010 10:08:11 AM (15 years ago)

Author:

vboxsync

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

64102

Message:

Additions/Linux: prepare for combined packaging

File:

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

trunk/Makefile.kmk

@@ -787 +787 @@
 #endif
 
+# ASSUMES the 64-bit edition are built first. This also serializes VM access.
 additions-build-linux.amd64:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
@@ -796 +797 @@
 endif
 
-additions-build-linux.x86:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST)
+additions-build-linux.x86:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST) additions-build-linux.amd64
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
@@ -802 +803 @@
 else
         $(call MSG_L1,Building Linux/x86 additions)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && 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"
 endif