Changeset 38998 in vbox for trunk/src/VBox/Installer

Timestamp:

Oct 14, 2011 2:59:01 PM (13 years ago)

Author:

vboxsync

Message:

Solaris/Installer: Manual dependency checking since IPS dropped old SVR4 package names.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• checkinstall.sh (modified) (1 diff)
• makepackage.sh (modified) (1 diff)
• vbox.depend (deleted)

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

@@ -545 +545 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.space \
-                $(VBOX_PATH_SOL_INST_SRC)/vbox.depend \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse \
                 $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in \
@@ -671 +670 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse                                   $(SOLARIS_BASEINST_DIR)/autoresponse
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.space                                         $(SOLARIS_BASEINST_DIR)/vbox.space
-        @# Warning!! If we add NON-PYTHON dependencies to vbox.depend, remove the VBOX_WITH_PYTHON setting
-        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.depend               $(SOLARIS_BASEINST_DIR)/vbox.depend,)
         $(QUIET)$(SED) \
                 -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \

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

@@ -30 +30 @@
 {
     errorprint "Please close all VirtualBox processes and re-run this installer."
-    errorprint "Note: It can take up to 10 seconds for all VirtualBox & related processes to close."
     exit 1
 }
 
+checkdep_svr4()
+{
+    if test -z "$1"; then
+        errorprint "Missing argument to checkdep_svr4"
+        return 1
+    fi
+    $BIN_PKGINFO $BASEDIR_OPT "$1" >/dev/null 2>&1
+    if test $? -eq 0; then
+        return 0
+    fi
+    PKG_MISSING_SVR4="$PKG_MISSING_SVR4 $1"
+    return 1
+}
+
+checkdep_ips()
+{
+    if test -z "$1"; then
+        errorprint "Missing argument to checkdep_svr4"
+        return 1
+    fi
+    # using "list" without "-a" only lists installed pkgs which is what we need
+    $BIN_PKG $BASEDIR_OPT list "$1" >/dev/null 2>&1
+    if test $? -eq 0; then
+        return 0
+    fi
+    PKG_MISSING_IPS="$PKG_MISSING_IPS $1"
+    return 1
+
+}
+
 # nothing to check for remote install
+REMOTE_INST=0
 if test "x${PKG_INSTALL_ROOT:=/}" != "x/"; then
+    BASEDIR_OPT="-R \"$PKG_INSTALL_ROOT\""
+    REMOTE_INST=1
+fi
+
+infoprint "Checking package dependencies..."
+
+PKG_MISSING_IPS=""
+PKG_MISSING_SVR4=""
+BIN_PKGINFO=`which pkginfo 2> /dev/null`
+BIN_PKG=`which pkg 2> /dev/null`
+
+if test -x "$BIN_PKG"; then
+    checkdep_ips "runtime/python-26"
+    checkdep_ips "system/library/iconv/utf-8"
+else
+    PKG_MISSING_IPS="runtime/python-26 system/library/iconv/utf-8"
+fi
+if test -x "$BIN_PKGINFO"; then
+    checkdep_svr4 "SUNWPython"
+    checkdep_svr4 "SUNWPython-devel"
+    checkdep_svr4 "SUNWuiu8"
+else
+    PKG_MISSING_SVR4="SUNWPython SUNWPython-devel SUNWuiu8"
+fi
+
+if test "$PKG_MISSING_IPS" != "" && test "$PKG_MISSING_SVR4" != ""; then
+    if test ! -x "$BIN_PKG" && test ! -x "$BIN_PKGINFO"; then
+        errorprint "Missing or non-executable binaries: pkg ($BIN_PKG) and pkginfo ($BIN_PKGINFO)."
+        errorprint "Cannot check for dependencies."
+        errorprint ""
+        errorprint "Please install one of the required packaging system."
+        exit 1
+    fi
+    errorprint "Missing packages: "
+    errorprint "IPS : $PKG_MISSING_IPS"
+    errorprint "SVr4: $PKG_MISSING_SVR4"
+    errorprint ""
+    errorprint "Please install either the IPS or SVr4 packages before installing VirtualBox."
+    exit 1
+else
+    infoprint "Done."
+fi
+
+# nothing more to do for remote installs
+if test "$REMOTE_INST" -eq 1; then
     exit 0
 fi

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

@@ -107 +107 @@
 if test -f "./vbox.copyright"; then
     echo 'i copyright=./vbox.copyright' >> prototype
-fi
-if test -f "./vbox.depend"; then
-    echo 'i depend=./vbox.depend' >> prototype
 fi