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

Timestamp:

Feb 21, 2023 3:33:14 PM (22 months ago)

Author:

vboxsync

Message:

Installer/solaris: Check VBOX_WITH_FE_BALLOONCTRL before assuming VBoxBalloonCtrl is there. Fix for previous committ regarding VBoxBugReport. bugref:10030

Location:

trunk/src/VBox/Installer/solaris

Files:

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

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

@@ -122 +122 @@
         $(VBOX_PATH_SOL_INST_SRC)/VBox.sh \
         $(VBOX_PATH_SOL_INST_SRC)/pkginstall.sh \
-        $(VBOX_PATH_SOL_INST_SRC)/smf-vboxballoonctrl.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_WEBSERVICES),$(VBOX_PATH_SOL_INST_SRC)/smf-vboxwebsrv.sh,)
@@ -179 +179 @@
 SOLARIS_SMF_FILES = \
         virtualbox-zoneaccess.xml \
-        virtualbox-balloonctrl.xml \
+        $(if-expr defined(VBOX_WITH_FE_BALLOONCTRL),mvirtualbox-balloonctrl.xml,) \
         virtualbox-autostart.xml \
         $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,)
@@ -433 +433 @@
         VBox.sh \
         pkginstall.sh \
-        smf-vboxballoonctrl.sh \
+        $(if $(VBOX_WITH_FE_BALLOONCTRL),smf-vboxballoonctrl.sh) \
         smf-vboxautostart.sh \
-        $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh,)
+        $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh)
 
 
@@ -490 +490 @@
         $(if $(VBOX_WITH_HEADLESS),VBoxHeadless) \
         $(if $(VBOX_WITH_FE_BUGREPORT),VBoxBugReport) \
-        VBoxBalloonCtrl \
+        $(if $(VBOX_WITH_FE_BALLOONCTRL),VBoxBalloonCtrl) \
         VBoxAutostart \
         $(if $(VBOX_WITH_WEBSERVICES),vboxwebsrv) \
@@ -686 +686 @@
         $(VBOX_PATH_SI_SCRATCH_PKG)/makepackage.sh \
                 $(if-expr defined(VBOX_WITH_HARDENING),--hardened,) \
+                $(if-expr !defined(VBOX_WITH_FE_BUGREPORT),--without-VBoxBugReport,) \
+                $(if-expr !defined(VBOX_WITH_FE_BALLOONCTRL),--without-VBoxBalloonCtrl,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME) \
@@ -735 +737 @@
                 $(if-expr defined(VBOX_WITH_HARDENING),--hardened,) \
                 $(if-expr !defined(VBOX_WITH_FE_BUGREPORT),--without-VBoxBugReport,) \
+                $(if-expr !defined(VBOX_WITH_FE_BALLOONCTRL),--without-VBoxBalloonCtrl,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME_SMF_STYLE) \

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

@@ -38 +38 @@
 PACKAGE_SPEC="prototype"
 OPT_WITHOUT_VBoxBugReport=""
+OPT_WITHOUT_VBoxBalloonCtrl=""
 while [ $# -ge 1 ];
 do
@@ -48 +49 @@
             PACKAGE_SPEC="virtualbox.p5m"
             ;;
-        --without-VBoxBugReport
+        --without-VBoxBugReport)
             OPT_WITHOUT_VBoxBugReport="yes"
+            ;;
+        --without-VBoxBalloonCtrl)
+            OPT_WITHOUT_VBoxBalloonCtrl="yes"
             ;;
         *)
@@ -246 +250 @@
     # Manifest class action scripts
     package_spec_fixup_filelist '$3 == "/var/svc/manifest/application/virtualbox/virtualbox-webservice.xml"'    '$2 = "manifest";$6 = "sys"'
-    package_spec_fixup_filelist '$3 == "/var/svc/manifest/application/virtualbox/virtualbox-balloonctrl.xml"'   '$2 = "manifest";$6 = "sys"'
+    if [ -z "${OPT_WITHOUT_VBoxBalloonCtrl}" ]; then
+        package_spec_fixup_filelist '$3 == "/var/svc/manifest/application/virtualbox/virtualbox-balloonctrl.xml"'   '$2 = "manifest";$6 = "sys"'
+    fi
     package_spec_fixup_filelist '$3 == "/var/svc/manifest/application/virtualbox/virtualbox-zoneaccess.xml"'    '$2 = "manifest";$6 = "sys"'
 
@@ -300 +306 @@
 
 # Add hardlinks for executables to launch the 32-bit or 64-bit executable
-for f in VBoxManage VBoxSDL VBoxAutostart vboxwebsrv VBoxZoneAccess VBoxSVC VBoxBalloonCtrl VBoxTestOGL VirtualBox VirtualBoxVM vbox-img VBoxHeadless; do
+for f in VBoxManage VBoxSDL VBoxAutostart vboxwebsrv VBoxZoneAccess VBoxSVC VBoxTestOGL VirtualBox VirtualBoxVM vbox-img VBoxHeadless; do
     package_spec_append_hardlink VBoxISAExec $f "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
 done
@@ -306 +312 @@
     package_spec_append_hardlink VBoxISAExec VBoxBugReport "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
 fi
+if [ -z "${OPT_WITHOUT_VBoxBalloonCtrl}" ]; then
+    package_spec_append_hardlink VBoxISAExec VBoxBalloonCtrl "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
+fi
 
 package_spec_fixup_content