Changeset 98680 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Feb 21, 2023 3:51:34 PM (22 months ago)

Author:

vboxsync

Message:

Installer/*: Check VBOX_WITH_FE_AUTOSTART before assuming VBoxAutostart and service files are there. bugref:10030

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (6 diffs)
• makepackage.sh (modified) (3 diffs)

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

@@ -123 +123 @@
         $(VBOX_PATH_SOL_INST_SRC)/pkginstall.sh \
         $(if $(VBOX_WITH_FE_BALLOONCTRL),$(VBOX_PATH_SOL_INST_SRC)/smf-vboxballoonctrl.sh) \
-        $(VBOX_PATH_SOL_INST_SRC)/smf-vboxautostart.sh \
+        $(if $(VBOX_WITH_FE_AUTOSTART),$(VBOX_PATH_SOL_INST_SRC)/smf-vboxautostart.sh) \
         $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_SOL_INST_SRC)/smf-vboxwebsrv.sh,)
 
@@ -180 +180 @@
         virtualbox-zoneaccess.xml \
         $(if-expr defined(VBOX_WITH_FE_BALLOONCTRL),mvirtualbox-balloonctrl.xml,) \
-        virtualbox-autostart.xml \
+        $(if-expr defined(VBOX_WITH_FE_AUTOSTART),virtualbox-autostart.xml,) \
         $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,)
 
@@ -434 +434 @@
         pkginstall.sh \
         $(if $(VBOX_WITH_FE_BALLOONCTRL),smf-vboxballoonctrl.sh) \
-        smf-vboxautostart.sh \
+        $(if $(VBOX_WITH_FE_AUTOSTART),smf-vboxautostart.sh) \
         $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh)
 
@@ -491 +491 @@
         $(if $(VBOX_WITH_FE_BUGREPORT),VBoxBugReport) \
         $(if $(VBOX_WITH_FE_BALLOONCTRL),VBoxBalloonCtrl) \
-        VBoxAutostart \
+        $(if $(VBOX_WITH_FE_AUTOSTART),VBoxAutostart) \
         $(if $(VBOX_WITH_WEBSERVICES),vboxwebsrv) \
         $(if $(VBOX_WITH_VBOX_IMG)$(VBOX_WITH_TESTCASES),vbox-img)
@@ -688 +688 @@
                 $(if-expr !defined(VBOX_WITH_FE_BUGREPORT),--without-VBoxBugReport,) \
                 $(if-expr !defined(VBOX_WITH_FE_BALLOONCTRL),--without-VBoxBalloonCtrl,) \
+                $(if-expr !defined(VBOX_WITH_FE_AUTOSTART),--without-VBoxAutostart,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME) \
@@ -738 +739 @@
                 $(if-expr !defined(VBOX_WITH_FE_BUGREPORT),--without-VBoxBugReport,) \
                 $(if-expr !defined(VBOX_WITH_FE_BALLOONCTRL),--without-VBoxBalloonCtrl,) \
+                $(if-expr !defined(VBOX_WITH_FE_AUTOSTART),--without-VBoxAutostart,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME_SMF_STYLE) \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -39 +39 @@
 OPT_WITHOUT_VBoxBugReport=""
 OPT_WITHOUT_VBoxBalloonCtrl=""
+OPT_WITHOUT_VBoxAutostart=""
 while [ $# -ge 1 ];
 do
@@ -54 +55 @@
         --without-VBoxBalloonCtrl)
             OPT_WITHOUT_VBoxBalloonCtrl="yes"
+            ;;
+        --without-VBoxAutostart)
+            OPT_WITHOUT_VBoxAutostart="yes"
             ;;
         *)
@@ -315 +319 @@
     package_spec_append_hardlink VBoxISAExec VBoxBalloonCtrl "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
 fi
+if [ -z "${OPT_WITHOUT_VBoxAutostart}" ]; then
+    package_spec_append_hardlink VBoxISAExec VBoxAutostart "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
+fi
 
 package_spec_fixup_content