Changeset 9159

Timestamp:

05/27/08 15:53:14 (5 months ago)

Author:

vboxsync

Message:

Solaris VBI installer: pack it in the same .tar.gz and removed duplicate readme.

Files:

• trunk/doc/ReadMe-Solaris-vbi.txt (deleted)
• trunk/doc/ReadMe-Solaris.txt (modified) (4 diffs)
• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (6 diffs)
• trunk/src/VBox/Installer/solaris/makepackage.sh (modified) (1 diff)

trunk/doc/ReadMe-Solaris.txt

@@ -9 +9 @@
-You must boot OpenSolaris in the same instruction set as the VirtualBox install package.
-This means if you are installing the 64-bit version of VirtualBox you MUST boot in
-
-
-
-
-
+
+
+
-
-After extracting the contents of the tar.gz file perform the following steps:
@@ -19 +17 @@
-1. Login as root using the "su" command.
-
-
+
+
+
+
+
+
+
-        pkgadd -d VirtualBox-@VBOX_VERSION_STRING@-SunOS-@BUILD_TARGET_ARCH@-r@VBOX_SVN_REV@.pkg
-
-The installer would then
+For each package the installer would
-        For this type "1" or "all".
-
-4. Then type "y" when asked about continuing with the installation.
-
-
-Start VirtualBox by typing "VirtualBox" from a
+ Start VirtualBox by typing
+VirtualBox from the
-
-
@@ -34 +38 @@
-----------------
-
-
+the 
-
-1. Login as root using the "su" command.
@@ -41 +45 @@
-        pkgrm SUNWvbox
-
+To remove the VirtualBox kernel interface module run the command:
+        pkgrm SUNWvboxkern
+

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

@@ -47 +47 @@
-# Targets
-INSTALLS         = solaris-doc
-VBIPKG_FILENAME).tar.gz $(PATH_BIN)/$(
+
-OTHER_CLEAN      = $(addprefix $(SOLARIS_INST_DIR)/,\
-        vbox.pkginfo vbox.copyright vbox.space vbox.pkgresponse \
@@ -201 +201 @@
-                $(PATH_ROOT)/doc/ReadMe-Solaris.txt \
-                Makefile.kmk \
+                $(if $(VBOX_WITH_SOLARIS_VBI),$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg,) \
-                $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt) \
-                $(if $(VBOX_OSE),,$(PATH_BIN)/LICENSE) \
@@ -314 +315 @@
-                --output $(SOLARIS_INST_DIR)/ReadMe.txt \
-                $(PATH_ROOT)/doc/ReadMe-Solaris.txt
+        $(QUIET)$(if $(VBOX_WITH_SOLARIS_VBI),$(INSTALL) -m 0644 $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg      $(SOLARIS_INST_DIR)/$(VBIPKG_FILENAME).pkg,)
-        $(call MSG_L1,Creating install package: $(PKG_FILENAME).tar.gz)
-
+ $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,)
-        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_INST_DIR)/$(PKG_FILENAME).tar.gz $(PATH_BIN)
-        @# Clean up files emitted as side-effect or result of packing
@@ -322 +324 @@
-
-
-PATH_BIN)/$(VBIPKG_FILENAME).tar.gz
+SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg
-                $(VBOX_VERSION_STAMP) \
-                vbi/vboxkern.pkginfo \
-                vbi/makepackage.sh \
-                $(PATH_ROOT)/doc/ReadMe-Solaris-vbi.txt \
-                Makefile.kmk \
-                $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi \
@@ -338 +339 @@
-        $(QUIET)$(SED) \
-                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
-                -e "s/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g" \
-                --output $(SOLARIS_VBI_DIR)/ReadMe.txt \
-                $(PATH_ROOT)/doc/ReadMe-Solaris-vbi.txt
-        $(QUIET)$(SED) \
-                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
-                -e "s/@VBOX_VERSION_REVSTAMP@/$(PKGINFO_REVSTAMP)/g" \
-                -e "s/@UNAME_P@/$(PKGINFO_ARCH)/g" \
@@ -348 +344 @@
-                $(PATH_CURRENT)/vbi/vboxkern.pkginfo
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/vbi/makepackage.sh                                           $(SOLARIS_VBI_DIR)/makepackage.sh
-tar.gz
+pkg
-        $(QUIET)$(SOLARIS_VBI_DIR)/makepackage.sh $(SOLARIS_VBI_DIR) $(VBIPKG_FILENAME)
-        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).tar.gz $(PATH_BIN)
-        @# Clean up files emitted as side-effect or result of packing
-        $(QUIET)$(RM) -f $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).tar.gz
-        $(QUIET)$(RM) -f $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg
-
-

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

@@ -92 +92 @@
-pkgtrans -s -o /var/spool/pkg "`pwd`/$VBOX_PKGFILE" "$VBOX_PKGNAME"
-
-
+
+
+
+
+
+
-
-echo "## Packaging and transfer completed successfully!"