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

Timestamp:

May 5, 2022 3:12:40 PM (3 years ago)

Author:

vboxsync

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

151255

Message:

Installer/darwin: Support building a driverless install package, bugref:9898

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (4 diffs)
• VirtualBox_mpkg/distribution-driverless.dist (copied) (copied from trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist ) (3 diffs)
• VirtualBox_mpkg/distribution.dist (modified) (1 diff)

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

@@ -175 +175 @@
 #
 $(VBOX_PATH_PACK_TMP)/DiskImage/VirtualBox.pkg: \
-                $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg \
+                $(if $(VBOX_WITH_VBOXDRV), $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg) \
                 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg \
                 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg \
@@ -236 +236 @@
         @# Build the package.
         $(VBOX_PRODUCTBUILD) \
-                --distribution $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist \
+                --distribution $(if $(VBOX_WITH_VBOXDRV), $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist, $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution-driverless.dist) \
                 --package-path $(VBOX_PATH_PACK_TMP)/Packages \
                 --resources $(VBOX_PATH_PACK_TMP)/VirtualBox.dist.res \
@@ -256 +256 @@
 
 
+ifdef VBOX_WITH_VBOXDRV
 #
 # The VirtualBox Kernel extensions.
@@ -348 +349 @@
                 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc \
                 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res
+endif # !VBOX_WITH_VBOXDRV
 
 

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

@@ -2 +2 @@
 <!--
 #
-# Copyright (C) 2008-2020 Oracle Corporation
+# Copyright (C) 2008-2022 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -106 +106 @@
     <welcome file="Welcome.rtf" mime-type="text/rtf" uti="public.rtf"/>
     <choices-outline>
-        <line choice="choiceVBoxKEXTs"></line>
         <line choice="choiceVBox"></line>
         <line choice="choiceVBoxCLI"></line>
-        <line choice="choiceOSXFuseCore"></line>
     </choices-outline>
-    <choice id="choiceVBoxKEXTs"   title="choiceVBoxKEXTs_title"   description="choiceVBoxKEXTs_msg"   start_selected="true" start_enabled="true" start_visible="true">
-        <pkg-ref id="org.virtualbox.pkg.vboxkexts"></pkg-ref>
-    </choice>
     <choice id="choiceVBox"        title="choiceVBox_title"        description="choiceVBox_msg"        start_selected="true" start_enabled="false" start_visible="true">
         <pkg-ref id="org.virtualbox.pkg.virtualbox"></pkg-ref>
@@ -120 +115 @@
         <pkg-ref id="org.virtualbox.pkg.virtualboxcli"></pkg-ref>
     </choice>
-    <choice id="choiceOSXFuseCore" title="choiceOSXFuseCore_title" description="choiceOSXFuseCore_msg" start_selected="true" start_enabled="true" start_visible="true">
-        <pkg-ref id="com.github.osxfuse.pkg.Core"></pkg-ref>
-    </choice>
-    <pkg-ref id="org.virtualbox.pkg.vboxkexts" auth="Root">file:./Contents/Packages/VBoxKEXTs.pkg</pkg-ref>
     <pkg-ref id="org.virtualbox.pkg.virtualbox" auth="Root">file:./Contents/Packages/VirtualBox.pkg</pkg-ref>
     <pkg-ref id="org.virtualbox.pkg.virtualboxcli" auth="Root">file:./Contents/Packages/VirtualBoxCLI.pkg</pkg-ref>
-    <pkg-ref id="com.github.osxfuse.pkg.Core" auth="Root">file:./Contents/Packages/OSXFuseCore.pkg</pkg-ref>
 </installer-gui-script>
 

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

@@ -2 +2 @@
 <!--
 #
-# Copyright (C) 2008-2020 Oracle Corporation
+# Copyright (C) 2008-2022 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as