Changeset 94866 in vbox for trunk/src/VBox/Installer/darwin

Timestamp:

May 5, 2022 8:08:47 PM (3 years ago)

Author:

vboxsync

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

151266

Message:

Installer/darwin: Need to modify host architecture detection in the installation script depending on the build target architecture, bugref:9898

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (3 diffs)
• VirtualBox_mpkg/distribution-driverless.dist (modified) (2 diffs)
• VirtualBox_mpkg/distribution.dist (modified) (2 diffs)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -41 +41 @@
 else
  VBOX_QT_VERSION_MAJOR = 5
+endif
+
+ifeq ($(KBUILD_TARGET_ARCH),arm64)
+ VBOX_DI_TARGET_ARCH = arm64
+ VBOX_DI_ARCH_LIST   = arm64
+else # Assume amd64 for now
+ VBOX_DI_TARGET_ARCH = x86-64
+ VBOX_DI_ARCH_LIST   = i386,arm64
 endif
 
@@ -211 +219 @@
                 --output $(VBOX_PATH_PACK_TMP)/VirtualBox.dist.res/English.lproj/Welcome.rtf \
                 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Welcome.rtf
+        @# Do keyword replacement in the distribution script.
+        $(SED) \
+                -e 's/@VBOX_TARGET_ARCH@/$(VBOX_DI_TARGET_ARCH)/g' \
+                -e 's/@VBOX_ARCH_LIST@/$(VBOX_DI_ARCH_LIST)/g' \
+                --output $(VBOX_PATH_PACK_TMP)/distribution.dist \
+                $(if $(VBOX_WITH_VBOXDRV), $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist, $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution-driverless.dist)
         @# Copy the resources.
         $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Conclusion.rtf                   $(VBOX_PATH_PACK_TMP)/VirtualBox.dist.res/English.lproj/Conclusion.rtf
@@ -240 +254 @@
         @# Build the package.
         $(VBOX_PRODUCTBUILD) \
-                --distribution $(if $(VBOX_WITH_VBOXDRV), $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist, $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution-driverless.dist) \
+                --distribution $(VBOX_PATH_PACK_TMP)/distribution.dist \
                 --package-path $(VBOX_PATH_PACK_TMP)/Packages \
                 --resources $(VBOX_PATH_PACK_TMP)/VirtualBox.dist.res \

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution-driverless.dist

@@ -15 +15 @@
 <installer-gui-script minSpecVersion="1.0">
     <title>VirtualBox_title</title>
-    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="i386,arm64"/>
+    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="@VBOX_ARCH_LIST@"/>
     <installation-check script="checkPrerequisite()"></installation-check>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
@@ -42 +42 @@
            test = system.sysctl('hw.machine');
            system.log("Hardware architecture detected: " + test);
-           result = (test == 'x86_64');
+           result = (test == '@VBOX_TARGET_ARCH@');
        } catch (e) { system.log(e); result = false; }
 

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist

@@ -15 +15 @@
 <installer-gui-script minSpecVersion="1.0">
     <title>VirtualBox_title</title>
-    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="i386,arm64"/>
+    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="@VBOX_ARCH_LIST@"/>
     <installation-check script="checkPrerequisite()"></installation-check>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
@@ -42 +42 @@
            test = system.sysctl('hw.machine');
            system.log("Hardware architecture detected: " + test);
-           result = (test == 'x86_64');
+           result = (test == '@VBOX_TARGET_ARCH@');
        } catch (e) { system.log(e); result = false; }