Changeset 49146 in vbox for trunk

Timestamp:

Oct 16, 2013 8:19:55 PM (11 years ago)

Author:

vboxsync

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

90006

Message:

extpacks: don't build solaris.x86

File:

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

trunk/Makefile.kmk

@@ -1067 +1067 @@
         extpacks-build-win.x86 \
         extpacks-build-solaris.amd64 \
-        extpacks-build-solaris.x86 \
         extpacks-build-os2.x86 \
         extpacks-build-linux.amd64 \
@@ -1120 +1119 @@
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 
-extpacks-build-solaris.x86: extpacks-build-solaris.amd64
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-
 else
 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
@@ -1132 +1128 @@
         $(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"
         $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
-        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
 
 extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
-        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
         $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
 
@@ -1144 +1136 @@
 
 extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
-extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
 endif
 
@@ -1223 +1214 @@
         extpacks-build-win.amd64 \
         extpacks-build-solaris.amd64 \
-        extpacks-build-solaris.x86 \
         extpacks-build-os2.x86 \
         extpacks-build-linux.amd64 \