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

Timestamp:

Aug 22, 2022 2:47:39 PM (2 years ago)

Author:

vboxsync

Message:

/Config.kmk and many other places: Change VBOX_VENDOR to the official copyright holder text, needs follow-up changes and equivalent adjustments elsewhere.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• checkinstall.sh (modified) (4 diffs)

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

@@ -647 +647 @@
 
 # Files related to package creation.
-        $(SED) -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
-                -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
-                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
-                -e "s/@VBOX_VERSION_REVSTAMP@/$(PKGINFO_REVSTAMP)/g" \
-                -e "s/@UNAME_P@/$(PKGINFO_ARCH)/g" \
-                -e "s/@VBOX_PSTAMP@/$(PKGINFO_PSTAMP)/g" \
+        $(SED) -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+g" \
+                -e "s+@VBOX_VENDOR@+$(VBOX_VENDOR)+g" \
+                -e "s+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g" \
+                -e "s+@VBOX_VERSION_REVSTAMP@+$(PKGINFO_REVSTAMP)+g" \
+                -e "s+@UNAME_P@+$(PKGINFO_ARCH)+g" \
+                -e "s+@VBOX_PSTAMP@+$(PKGINFO_PSTAMP)+g" \
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/vbox.pkginfo \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo
-        $(SED) -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
-                -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
-                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_SMF_STYLE)/g" \
-                -e "s/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g" \
-                -e "s/@UNAME_P@/$(PKGINFO_ARCH)/g" \
+        $(SED) -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+g" \
+                -e "s+@VBOX_VENDOR@+$(VBOX_VENDOR)+g" \
+                -e "s+@VBOX_VERSION_STRING@+$(VBOX_VERSION_SMF_STYLE)+g" \
+                -e "s+@VBOX_SVN_REV@+$(VBOX_SVN_REV)+g" \
+                -e "s+@UNAME_P@+$(PKGINFO_ARCH)+g" \
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/vbox-ips.mog \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox-ips.mog
@@ -695 +695 @@
         $(QUIET)$(RM) -f -- $(VBOX_PATH_SI_SCRATCH)/ReadMe.txt "$@"
         $(QUIET)$(SED) \
-                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
-                -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
-                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
-                -e "s/@KBUILD_TARGET_ARCH@/$(KBUILD_TARGET_ARCH)/g" \
-                -e "s/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g" \
+                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+g" \
+                -e "s+@VBOX_VENDOR@+$(VBOX_VENDOR)+g" \
+                -e "s+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g" \
+                -e "s+@KBUILD_TARGET_ARCH@+$(KBUILD_TARGET_ARCH)+g" \
+                -e "s+@VBOX_SVN_REV@+$(VBOX_SVN_REV)+g" \
                 --output $(VBOX_PATH_SI_SCRATCH)/ReadMe.txt \
                 $(PATH_ROOT)/doc/ReadMe-Solaris.txt

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

@@ -34 +34 @@
 }
 
-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()
 {
@@ -150 +136 @@
 
 PKG_MISSING_IPS=""
-PKG_MISSING_SVR4=""
-BIN_PKGINFO=/usr/bin/pkginfo
 BIN_PKG=/usr/bin/pkg
 BIN_SVCS=/usr/bin/svcs
@@ -162 +146 @@
 
 if test -x "$BIN_PKG"; then
-    checkdep_ips_either "runtime/python-26" "runtime/python-27"
-    checkdep_ips_either "system/library/iconv/utf-8" "system/library/iconv/iconv-core"
-    checkdep_ips_either "system/library/gcc/gcc-c++-runtime" "system/library/gcc-45-runtime"
-    checkdep_ips_either "system/library/gcc/gcc-c-runtime" "system/library/gcc-45-runtime"
+    checkdep_ips "system/library/iconv/iconv-core"
+    checkdep_ips "x11/library/libice"
+    checkdep_ips "x11/library/libsm"
+    checkdep_ips "x11/library/libx11"
+    checkdep_ips "x11/library/libxcb"
+    checkdep_ips "x11/library/libxext"
+    checkdep_ips "x11/library/libxfixes"
+    checkdep_ips "x11/library/libxkbcommon"
+    checkdep_ips "x11/library/libxrender"
+    checkdep_ips "x11/library/mesa"
+    checkdep_ips "x11/library/toolkit/libxt"
+    checkdep_ips "x11/library/xcb-util"
+    checkdep_ips_either "runtime/python-26" "runtime/python-27" "runtime/python-35" "runtime/python-36" "runtime/python-37" "runtime/python-38" "runtime/python-39"
+    checkdep_ips_either "system/library/gcc/gcc-c++-runtime" "system/library/gcc/gcc-c++-runtime-9"
+    checkdep_ips_either "system/library/gcc/gcc-c-runtime" "system/library/gcc/gcc-c-runtime-9"
 else
-    PKG_MISSING_IPS="runtime/python-26 system/library/iconv/utf-8 system/library/gcc/gcc-c++-runtime system/library/gcc/gcc-c-runtime"
-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 "x$PKG_MISSING_IPS" != "x" && test "x$PKG_MISSING_SVR4" != "x"; then
-    if test ! -x "$BIN_PKG" && test ! -x "$BIN_PKGINFO"; then
-        errorprint "Missing or non-executable binaries: pkg ($BIN_PKG) and pkginfo ($BIN_PKGINFO)."
+    PKG_MISSING_IPS="runtime/python-37 system/library/iconv/iconv-core system/library/gcc/gcc-c++-runtime-9 system/library/gcc/gcc-c-runtime-9"
+fi
+
+if test "x$PKG_MISSING_IPS" != "x"; then
+    if test ! -x "$BIN_PKG"; then
+        errorprint "Missing or non-executable binary: pkg ($BIN_PKG)."
         errorprint "Cannot check for dependencies."
         errorprint ""
@@ -185 +173 @@
         exit 1
     fi
-    errorprint "Missing packages: "
-    errorprint "IPS : $PKG_MISSING_IPS"
-    errorprint "SVr4: $PKG_MISSING_SVR4"
+    errorprint "Missing packages: $PKG_MISSING_IPS"
     errorprint ""
-    errorprint "Please install either the IPS or SVr4 packages before installing VirtualBox."
+    errorprint "Please install these packages before installing VirtualBox."
     exit 1
 else