Changeset 106848 in vbox

Timestamp:

Nov 6, 2024 9:09:49 AM (5 months ago)

Author:

vboxsync

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

165760

Message:

/Makefile.kmk: Try include win.arm64 into the additions build. VBP-1440

File:

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

trunk/Makefile.kmk

@@ -1168 +1168 @@
 #
 VBOX_BLD_VM_LNX_IP               := 192.168.27.2
-VBOX_BLD_VM_LNX_ARM64_IP         := 192.168.27.26
+VBOX_BLD_VM_LNX_ARM64_IP         := 192.168.27.26  ## @todo this should've been 22, not 26...
 VBOX_BLD_VM_OS2_IP               := 192.168.27.3
 VBOX_BLD_VM_SOLARIS_IP           := 192.168.27.4
@@ -1177 +1177 @@
 VBOX_BLD_VM_WIN_X86_IP           := 192.168.27.6
 VBOX_BLD_VM_WIN_AMD64_IP         := 192.168.27.16
+VBOX_BLD_VM_WIN_ARM64_IP         := 192.168.27.36 # .26 is taken by the linux arm build vm...
 VBOX_BLD_VM_FBSD_X86_IP          := 192.168.27.7
 VBOX_BLD_VM_FBSD_AMD64_IP        := 192.168.27.17
@@ -1224 +1225 @@
         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     VBOX_ONLY_ADDITIONS=1
         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     VBOX_ONLY_ADDITIONS=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=arm64 KBUILD_TARGET=win     VBOX_ONLY_ADDITIONS=1
 
 
@@ -1233 +1235 @@
                 additions-build-win.x86 \
                 additions-build-win.amd64 \
+                additions-build-win.arm64 \
                 additions-build-solaris.amd64 \
                 additions-build-solaris.x86 \
@@ -1259 +1262 @@
         KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=x86 VBOX_SVN_REV=$(VBOX_SVN_REV)
 
-ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
- VBOX_ADDITIONS_BUILD.arm64 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
-        KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=arm64 VBOX_SVN_REV=$(VBOX_SVN_REV)
-endif
+VBOX_ADDITIONS_BUILD.arm64 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
+        KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=arm64 VBOX_SVN_REV=$(VBOX_SVN_REV)
 
 # Automatically determine the additions build subdir name. Used for figuring
@@ -1288 +1289 @@
         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_X86_IP) ' 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 build+pack)
+endif
+
+ifeq ($(KBUILD_TARGET),win)
+ additions-build-win.arm64:
+        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.arm64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.arm64) packing
+else
+ additions-build-win.arm64:
+        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/arm64 additions build.pack)
+        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_ARM64_IP) ' cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.arm64) all packing '
+        $(call VBOX_BLD_VM_MSG_END__,Windows/arm64 additions build+pack)
 endif
 
@@ -1648 +1660 @@
                 VBOX_WITH_ADDITIONS_ISO.win.amd64=1 \
                 VBOX_WITH_ADDITIONS_ISO.win.x86=1 \
+                VBOX_WITH_ADDITIONS_ISO.win.arm64=1 \
                 -C src/VBox/Additions \
                 $(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip
@@ -1654 +1667 @@
                 additions-build-win.x86 \
                 additions-build-win.amd64 \
+                additions-build-win.arm64 \
                 additions-build-solaris.amd64 \
                 additions-build-solaris.x86 \