Changeset 106262 in vbox for trunk

Timestamp:

Oct 9, 2024 6:57:43 PM (6 months ago)

Author:

vboxsync

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

165054

Message:

Main: Automatic GAs upgrade: Add support for Linux/Arm64 installer, bugref:10783.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImplTasks.h (modified) (1 diff)
• src-client/GuestSessionImplTasks.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/GuestSessionImplTasks.h

@@ -462 +462 @@
     int waitForGuestSession(ComObjPtr<Guest> pGuest, eOSType osType, ComObjPtr<GuestSession> &pNewSession);
 
+    PlatformArchitecture_T getPlatformArch(void);
+
     /** Files to handle. */
     std::vector<ISOFile>        mFiles;

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -2910 +2910 @@
 
     return vrcRet;
+}
+
+/**
+ * Helper function which retrieves guest platform architecture information.
+ *
+ * @returns Platform architecture type or PlatformArchitecture_None if
+ *          architecture information cannot be retrieved.
+ */
+PlatformArchitecture_T GuestSessionTaskUpdateAdditions::getPlatformArch(void)
+{
+    HRESULT hrc;
+    PlatformArchitecture_T enmArch = PlatformArchitecture_None;
+
+    ComObjPtr<GuestSession> pSession = mSession;
+    Assert(!pSession.isNull());
+
+    ComObjPtr<Guest> pGuest(pSession->i_getParent());
+    Assert(!pGuest.isNull());
+
+    ComObjPtr<Console> pConsole = pGuest->i_getConsole();
+    Assert(!pConsole.isNull());
+
+    const ComPtr<IMachine> pMachine = pConsole->i_machine();
+    Assert(!pMachine.isNull());
+
+    ComPtr<IPlatform> pPlatform;
+
+    hrc = pMachine->COMGETTER(Platform)(pPlatform.asOutParam());
+    AssertComRCReturn(hrc, PlatformArchitecture_None);
+
+    hrc = pPlatform->COMGETTER(Architecture)(&enmArch);
+    AssertComRCReturn(hrc, PlatformArchitecture_None);
+
+    return enmArch;
 }
 
@@ -3261 +3295 @@
                         case eOSType_Linux:
                         {
+                            bool fIsArm = getPlatformArch() == PlatformArchitecture_ARM;
+
+                            const Utf8Str strInstallerBinUC("VBOXLINUXADDITIONS" + Utf8Str(fIsArm ? "-ARM64" : "") + ".RUN");
+                            const Utf8Str strInstallerBin  ("VBoxLinuxAdditions" + Utf8Str(fIsArm ? "-arm64" : "") + ".run");
+
                             /* Copy over the installer to the guest but don't execute it.
                              * Execution will be done by the shell instead. */
-                            mFiles.push_back(ISOFile("VBOXLINUXADDITIONS.RUN",
-                                                     strUpdateDir + "VBoxLinuxAdditions.run", ISOFILE_FLAG_COPY_FROM_ISO));
+                            mFiles.push_back(ISOFile(strInstallerBinUC, strUpdateDir + strInstallerBin, ISOFILE_FLAG_COPY_FROM_ISO));
 
                             UpdateAdditionsStartupInfo siInstaller;
@@ -3274 +3312 @@
                             siInstaller.mArguments.push_back("/bin/sh");
                             /* Now add the stuff we need in order to execute the installer.  */
-                            siInstaller.mArguments.push_back(strUpdateDir + "VBoxLinuxAdditions.run");
+                            siInstaller.mArguments.push_back(strUpdateDir + strInstallerBin);
                             /* Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking xterm
                              * window spawned when doing any unattended Linux GA installations. */