Changeset 40327 in vbox

Timestamp:

Mar 2, 2012 3:11:29 PM (13 years ago)

Author:

vboxsync

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

76592

Message:

Makefile.kmk: Building additions for OS/2.

File:

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

trunk/Makefile.kmk

@@ -811 +811 @@
         ))
 
+
+#
+# VM IP addresses.
+#
+VBOX_BLD_VM_RHEL3_X86_IP := 192.168.27.2
+VBOX_BLD_VM_OS2_IP       := 192.168.27.3
+
+
 #
 # Build the additions, all of them.
@@ -916 +924 @@
 endif
 
-ifdef VBOX_WITH_OS2_ADD_BUILD
- VBOX_BLD_VM_OS2_IP := 192.168.27.3
- VBOX_BLD_VM_OS2_IP := 10.42.1.148
+if 1 #def VBOX_WITH_OS2_ADD_BUILD
  ifeq ($(KBUILD_TARGET),os2)
 additions-build-os2.x86:
@@ -973 +979 @@
 else
         $(call MSG_L1,Building Linux/x86 additions)
-        $(VBOX_KMK_TIME) ssh vbox@192.168.27.2 " 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"
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_RHEL3_X86_IP) " 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
 
@@ -984 +990 @@
 else
         $(call MSG_L1,Building Linux/x86 additions)
-        $(VBOX_KMK_TIME) ssh vbox@192.168.27.2 " 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"
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_RHEL3_X86_IP) " 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
 
@@ -995 +1001 @@
                 VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \
                 VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 \
+                VBOX_WITH_ADDITIONS_ISO.os2.x86=1 \
                 VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \
                 VBOX_WITH_ADDITIONS_ISO.solaris.x86=1 \
@@ -1122 +1129 @@
 #       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 #else
-#       $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
+#       $(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) "
 #endif
 
@@ -1304 +1311 @@
 #       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
 #else
-#       $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) "
+#       $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) "
 #endif
 
@@ -1320 +1327 @@
 else
         $(call MSG_L1,Building Linux/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh vbox@192.168.27.2 " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all"
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_RHEL3_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all"
 endif