Changeset 98676 in vbox

Timestamp:

Feb 21, 2023 3:26:57 PM (22 months ago)

Author:

vboxsync

Message:

Installer/*: Check VBOX_WITH_FE_BUGREPORT before assuming VBoxBugReport is there. bugref:10030

Location:

trunk/src/VBox/Installer

Files:

• darwin/Makefile.kmk (modified) (2 diffs)
• linux/Makefile.kmk (modified) (1 diff)
• linux/install.sh (modified) (2 diffs)
• linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• solaris/Makefile.kmk (modified) (2 diffs)
• solaris/makepackage.sh (modified) (4 diffs)

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

@@ -417 +417 @@
         MacOS/VBoxNetAdpCtl \
         MacOS/VBoxExtPackHelperApp \
-        MacOS/VBoxBugReport \
+        $(if $(VBOX_WITH_FE_BUGREPORT),MacOS/VBoxBugReport) \
         MacOS/VBoxBalloonCtrl \
         MacOS/VBoxAutostart \
@@ -1008 +1008 @@
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/vboximg-mount "$$@"'
 endif
+if defined(VBOX_WITH_FE_BUGREPORT)
         $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxBugReport \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxBugReport "$$@"'
+endif
         $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxBalloonCtrl \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxBalloonCtrl "$$@"'

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

@@ -172 +172 @@
         VBoxAutostart \
         VBoxBalloonCtrl \
-        VBoxBugReport \
+        $(if $(VBOX_WITH_FE_BUGREPORT),VBoxBugReport,) \
         VBoxManage \
         VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \

trunk/src/VBox/Installer/linux/install.sh

@@ -334 +334 @@
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxHeadless
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxBalloonCtrl
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxBugReport
+    if [ -f $INSTALLATION_DIR/VBoxBugReport ]; then
+        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxBugReport
+    fi
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxAutostart
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/vboxwebsrv
@@ -369 +371 @@
     ln -sf VBoxSDL /usr/bin/vboxsdl > /dev/null 2>&1
     ln -sf VBoxHeadless /usr/bin/vboxheadless > /dev/null 2>&1
-    ln -sf VBoxBugReport /usr/bin/vboxbugreport > /dev/null 2>&1
+    if [ -f $INSTALLATION_DIR/VBoxBugReport ]; then
+        ln -sf VBoxBugReport /usr/bin/vboxbugreport > /dev/null 2>&1
+    fi
     if [ -f $INSTALLATION_DIR/VBoxDTrace ]; then
         ln -sf VBoxDTrace /usr/bin/vboxdtrace > /dev/null 2>&1

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -189 +189 @@
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxdtrace
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxaudiotest
-ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxBugReport
-ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxbugreport
+test -f VBoxBugReport && ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxBugReport
+test -f VBoxBugReport && ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxbugreport
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxBalloonCtrl
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxballoonctrl

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

@@ -489 +489 @@
 SOLARIS_STRIP_EXES += \
         $(if $(VBOX_WITH_HEADLESS),VBoxHeadless) \
-        VBoxBugReport \
+        $(if $(VBOX_WITH_FE_BUGREPORT),VBoxBugReport) \
         VBoxBalloonCtrl \
         VBoxAutostart \
@@ -734 +734 @@
                 --ips \
                 $(if-expr defined(VBOX_WITH_HARDENING),--hardened,) \
+                $(if-expr !defined(VBOX_WITH_FE_BUGREPORT),--without-VBoxBugReport,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME_SMF_STYLE) \

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

@@ -29 +29 @@
 #
 # Usage:
-#       makepackage.sh [--hardened] [--ips] $(PATH_TARGET)/install packagename {$(KBUILD_TARGET_ARCH)|neutral} $(VBOX_SVN_REV)
+#       makepackage.sh [--hardened] [--ips] [--without-VBoxBugReport] \
+#           $(PATH_TARGET)/install packagename {$(KBUILD_TARGET_ARCH)|neutral} $(VBOX_SVN_REV)
 
 
@@ -36 +37 @@
 IPS_PACKAGE=""
 PACKAGE_SPEC="prototype"
+OPT_WITHOUT_VBoxBugReport=""
 while [ $# -ge 1 ];
 do
@@ -46 +48 @@
             PACKAGE_SPEC="virtualbox.p5m"
             ;;
-    *)
-        break
-        ;;
+        --without-VBoxBugReport
+            OPT_WITHOUT_VBoxBugReport="yes"
+            ;;
+        *)
+            break
+            ;;
     esac
     shift
@@ -295 +300 @@
 
 # Add hardlinks for executables to launch the 32-bit or 64-bit executable
-for f in VBoxManage VBoxSDL VBoxAutostart vboxwebsrv VBoxZoneAccess VBoxSVC VBoxBugReport VBoxBalloonCtrl VBoxTestOGL VirtualBox VirtualBoxVM vbox-img VBoxHeadless; do
-    package_spec_append_hardlink VBoxISAExec    $f  "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
+for f in VBoxManage VBoxSDL VBoxAutostart vboxwebsrv VBoxZoneAccess VBoxSVC VBoxBalloonCtrl VBoxTestOGL VirtualBox VirtualBoxVM vbox-img VBoxHeadless; do
+    package_spec_append_hardlink VBoxISAExec $f "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
 done
+if [ -z "${OPT_WITHOUT_VBoxBugReport}" ]; then
+    package_spec_append_hardlink VBoxISAExec VBoxBugReport "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
+fi
 
 package_spec_fixup_content