Changeset 100260 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 23, 2023 12:08:56 PM (20 months ago)

Author:

vboxsync

Message:

Additions/linux: Packaging nad installer fixes for arm64, bugref:10457

Location:

trunk/src/VBox/Additions

Files:

• Makefile.kmk (modified) (2 diffs)
• linux/Makefile.kmk (modified) (2 diffs)
• linux/installer/install.sh.in (modified) (1 diff)

trunk/src/VBox/Additions/Makefile.kmk

@@ -225 +225 @@
  GUESTADDITIONS_FILESPEC.linux.amd64 = \
         $(VBOX_LNX_ADD_AMD64_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.amd64)/VBoxLinuxAdditions.run
+endif
+ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
+ 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
+   VBOX_LNX_ADD_ARM64_RUN_PKG = VBoxLinuxAdditions.run
+  else
+   VBOX_LNX_ADD_ARM64_RUN_PKG = VBoxLinuxAdditions-arm64.run
+  endif
+  GUESTADDITIONS_FILESPEC.linux.arm64 = \
+     $(VBOX_LNX_ADD_ARM64_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.arm64)/VBoxLinuxAdditions.run
+ endif
 endif
 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86
@@ -362 +374 @@
         $(GUESTADDITIONS_FILESPEC.linux.x86) \
         $(GUESTADDITIONS_FILESPEC.linux.amd64) \
+        $(if-expr defined(VBOX_WITH_LNX_ARM64_ADDITIONS),$(GUESTADDITIONS_FILESPEC.linux.arm64,)) \
         $(GUESTADDITIONS_FILESPEC.freebsd.x86) \
         $(GUESTADDITIONS_FILESPEC.freebsd.amd64) \

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

@@ -96 +96 @@
 VBOX_LNX_ADD_ARCHIVE.x86   := $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-x86.tar.bz2
 VBOX_LNX_ADD_ARCHIVE.amd64 := $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2
+ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
+ VBOX_LNX_ADD_ARCHIVE.arm64 := $(PATH_OUT_BASE)/linux.arm64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-arm64.tar.bz2
+endif
 ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
  VBOX_LNX_ADD_ARCHIVES := $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH).tar.bz2
@@ -101 +104 @@
  VBOX_LNX_ADD_ARCHIVES := \
         $(VBOX_LNX_ADD_ARCHIVE.x86) \
-        $(VBOX_LNX_ADD_ARCHIVE.amd64)
+        $(VBOX_LNX_ADD_ARCHIVE.amd64) \
+        $(if-expr defined(VBOX_WITH_LNX_ARM64_ADDITIONS),$(VBOX_LNX_ADD_ARCHIVE.arm64,)
 endif
 BLDDIRS     += \

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -325 +325 @@
     lib_candidates="/usr/lib/x86_64-linux-gnu /usr/lib64 /usr/lib /lib64 /lib"
     ;;
+  aarch64|arm64)
+    cpu="arm64"
+    lib_candidates="/usr/lib64 /usr/lib /lib64 /lib"
+    ;;
   *)
     cpu="unknown"