Changeset 31139 in vbox

Timestamp:

Jul 27, 2010 1:23:27 PM (14 years ago)

Author:

vboxsync

Message:

Makefile.kmk: try to separate the final packing of the Linux Additions from the rest

File:

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

trunk/Makefile.kmk

@@ -704 +704 @@
         additions-build-win.amd64 \
         additions-build-os2.x86 \
-        additions-build-linux.amd64 \
-        additions-build-linux.x86
+        additions-build-linux.x86.combined
 
 VBOX_ADDITIONS_BUILD.amd64 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
@@ -787 +786 @@
 #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)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
 else
         $(call MSG_L1,Building Linux/amd64 additions)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing"
-endif
-
-additions-build-linux.x86:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST) additions-build-linux.amd64
+        $(VBOX_KMK_TIME) ssh [email protected] " 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"
+endif
+
+additions-build-linux.x86:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
+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_WITHOUT_LINUX_GUEST_PACKAGE=1"
+endif
+
+# Combined Linux Additions .run package.  This depends on the archives
+# created during packing by the archetecture-specific builds.
+additions-build-linux.x86.combined:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST) additions-build-linux.x86 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)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1
 else
         $(call MSG_L1,Building Linux/x86 additions)
@@ -811 +820 @@
                 VBOX_WITH_ADDITIONS_ISO.freebsd.amd64= \
                 VBOX_WITH_ADDITIONS_ISO.freebsd.x86= \
-                VBOX_WITH_ADDITIONS_ISO.linux.amd64=1 \
+                VBOX_WITH_ADDITIONS_ISO.linux.amd64= \
                 VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \
                 VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \
@@ -829 +838 @@
         additions-build-linux.amd64 \
         additions-build-linux.x86 \
+        additions-build-linux.x86.combined \
         additions-packing