Changeset 101507 in vbox

Timestamp:

Oct 19, 2023 10:49:59 AM (18 months ago)

Author:

vboxsync

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

159579

Message:

Additions/linux: Packaging and installer fix for arm64. Take into account it is built on a different system and cannot go into the combined Linux additions installer. bugref:10457

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/linux/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -427 +427 @@
 # (Used by the additions build server, don't invert it.)
 #VBOX_WITHOUT_ADDITIONS_ISO = 1
-# Include and build he Linux arm64 guest additions.
+# Include and build the Linux arm64 guest additions.
 VBOX_WITH_LNX_ARM64_ADDITIONS = 1
 ## @}

trunk/src/VBox/Additions/Makefile.kmk

@@ -229 +229 @@
  ifdef VBOX_WITH_ADDITIONS_ISO.linux.arm64
   VBOX_PATH_ADDITIONS.linux.arm64 = $(PATH_OUT_BASE)/linux.arm64/$(KBUILD_TYPE)/bin/additions
-  ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
+  # Use specific check for arm64 platform because it currently is built separately and
+  # therefore cannot be combined into the x86/amd64 installer package.
+  ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE_INCLUDING_ARM64
    VBOX_LNX_ADD_ARM64_RUN_PKG = VBoxLinuxAdditions.run
   else

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -105 +105 @@
         $(VBOX_LNX_ADD_ARCHIVE.x86) \
         $(VBOX_LNX_ADD_ARCHIVE.amd64) \
-        $(if-expr defined(VBOX_WITH_LNX_ARM64_ADDITIONS),$(VBOX_LNX_ADD_ARCHIVE.arm64),)
+        $(if-expr defined(VBOX_WITH_LNX_ARM64_ADDITIONS) && defined(VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE_INCLUDING_ARM64),$(VBOX_LNX_ADD_ARCHIVE.arm64),)
 endif
 BLDDIRS     += \