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

Timestamp:

Jul 22, 2009 11:37:48 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: add Python dependencies.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (3 diffs)
• makepackage.sh (modified) (2 diffs)
• vbox.depend (added)

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

@@ -124 +124 @@
 
 OTHER_CLEAN      += $(addprefix $(SOLARIS_BASEINST_DIR)/,\
-        vbox.pkginfo vbox.copyright vbox.space vbox.pkgresponse \
+        vbox.pkginfo vbox.copyright vbox.space vbox.depend vbox.pkgresponse \
         makepackage.sh prototype postinstall.sh checkinstall.sh preremove.sh)
 
@@ -477 +477 @@
                 $(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 \
                 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop \
@@ -562 +563 @@
         $(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_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \

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

@@ -106 +106 @@
     echo 'i copyright=./vbox.copyright' >> prototype
 fi
+if test -f "./vbox.depend"; then
+    echo 'i depend=./vbox.depend' >> prototype
+fi
 
 # Create relative hardlinks
@@ -131 +134 @@
 # Exclude directories to not cause install-time conflicts with existing system directories
 cd "$PKG_BASE_DIR"
-find . ! -type d | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|checkinstall.sh|preremove.sh|ReadMe.txt|vbox.space|vbox.copyright|VirtualBoxKern' | pkgproto >> prototype
+find . ! -type d | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|checkinstall.sh|preremove.sh|ReadMe.txt|vbox.space|vbox.depend|vbox.copyright|VirtualBoxKern' | pkgproto >> prototype
 
 # Include only opt/VirtualBox and subdirectories as we want uninstall to clean up directory structure as well