Changeset 106987 in vbox for trunk/Makefile.kmk

Timestamp:

Nov 13, 2024 2:47:57 PM (2 weeks ago)

Author:

vboxsync

Message:

/Makefile.kmk: Combined package updates (win.arm64 + win.amd64). jiraref:VBP-1442

File:

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

trunk/Makefile.kmk

@@ -348 +348 @@
  #
  if   defined(VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER) \
-   && (   !defined(VBOX_WITH_COMBINED_PACKAGE) \
-   || "$(KBUILD_TARGET_ARCH)" == "amd64" )
+   && (!defined(VBOX_WITH_COMBINED_PACKAGE) || "$(KBUILD_TARGET_ARCH)" == "amd64")
   INSTALLS += buildserver-additions
   buildserver-additions_INST = $(INST_ADDITIONS_ISO)
@@ -1087 +1086 @@
 # Combined package build (windows only).
 #
-# The combined package is created by the x86 environment, so we do the amd64
+# The combined package is created by the amd64 environment, so we do the arm64
 # packaging in the build phase since it's just a few very slow jobs.  We hold
-# back the x86 build until the amd64 packaging starts, to try encourage
+# back the amd64 build until the amd64 packaging starts, to try encourage
 # parallel execution.
 #
 # Note! VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER=1 is required because the additions
-#       packing must be done in amd64 mode as it picks files from the x86 build.
+#       packing must be done in amd64 mode as it picks files from the arm64 build.
 #
 
@@ -1103 +1102 @@
 combined-package-fetch:
         + $(KMK) -C tools $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=amd64
-        + $(KMK) -C tools $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=x86
+        + $(KMK) -C tools $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=arm64
 
 combined-package-build-amd64:
         + $(KMK) docs all $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=amd64
 
-combined-package-build-amd64-packing: combined-package-build-amd64
-        + $(KMK) packing  $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=amd64
-
-combined-package-build-x86: combined-package-build-amd64
-        + $(KMK) docs all $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=x86
-
-combined-package-build: combined-package-build-amd64-packing combined-package-build-x86
+combined-package-build-arm64:
+        + $(KMK) docs all $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=arm64
+
+combined-package-build-arm64-packing: combined-package-build-arm64
+        + $(KMK) packing  $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=arm64
+
+combined-package-build: combined-package-build-arm64-packing combined-package-build-amd64
 
 combined-package-packing:
-        + $(KMK) packing   $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=x86
+        + $(KMK) packing   $(VBOX_COMBINED_PACKAGE_DEFS) KBUILD_TARGET_ARCH=amd64