Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 8122)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 8123)
@@ -225,5 +225,5 @@
 	$(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/doc/ReadMe-Solaris.txt                                          $(SOLARISINSTDIR)/ReadMe.txt
 	$(call MSG_L1,Creating install package: $(PKGFILENAME).tar.gz)
-	$(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME) $(BUILD_TARGET_ARCH) 1>/dev/null 2>/dev/null
+	$(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME) $(BUILD_TARGET_ARCH)
 	$(QUIET)$(INSTALL) -m 0755 $(SOLARISINSTDIR)/$(PKGFILENAME).tar.gz $(PATH_BIN)
 
Index: /trunk/src/VBox/Installer/solaris/makepackage.sh
===================================================================
--- /trunk/src/VBox/Installer/solaris/makepackage.sh	(revision 8122)
+++ /trunk/src/VBox/Installer/solaris/makepackage.sh	(revision 8123)
@@ -1,3 +1,4 @@
 #!/bin/sh
+set -e
 # innotek VirtualBox
 # VirtualBox Solaris package creation script.
@@ -23,4 +24,23 @@
 fi
 
+MY_PKGNAME=SUNWvbox
+MY_GGREP=/usr/sfw/bin/ggrep
+MY_AWK=/usr/bin/awk
+MY_GTAR=/usr/sfw/bin/gtar
+
+# check for GNU grep we use which might not ship with all Solaris
+if test ! -f "$MY_GGREP" || test ! -h "$MY_GGREP"; then
+    echo "## GNU grep not found in $MY_GGREP."
+    exit 1
+fi
+
+# check for GNU tar we use which might not ship with all Solaris
+if test ! -f "$MY_GTAR" || test ! -h "$MY_GTAR"; then
+    echo "## GNU tar not found in $MY_GTAR."
+    exit 1
+fi
+
+
+# prepare file list
 cd "$1"
 echo 'i pkginfo=./vbox.pkginfo' > prototype
@@ -29,21 +49,42 @@
 echo 'i space=./vbox.space' >> prototype
 echo 'e sed /etc/devlink.tab ? ? ?' >> prototype
-find . -print | /usr/sfw/bin/ggrep -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|preremove.sh|ReadMe.txt|vbox.space' | pkgproto >> prototype
-/usr/bin/awk 'NF == 6 && $2 == "none" { $5 = "root"; $6 = "bin" } { print }' prototype > prototype2
-/usr/bin/awk 'NF == 6 && $2 == "none" { $3 = "opt/VirtualBox/"$3"="$3 } { print }' prototype2 > prototype
+find . -print | $MY_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|preremove.sh|ReadMe.txt|vbox.space' | pkgproto >> prototype
+
+# don't grok for the sed class files
+$MY_AWK 'NF == 6 && $2 == "none" { $5 = "root"; $6 = "bin" } { print }' prototype > prototype2
+$MY_AWK 'NF == 6 && $2 == "none" { $3 = "opt/VirtualBox/"$3"="$3 } { print }' prototype2 > prototype
 
 # install the kernel module to the right place.
 if test "$3" = "x86"; then
-    /usr/bin/awk 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv=vboxdrv" { $3 = "platform/i86pc/kernel/drv/vboxdrv=vboxdrv" } { print }' prototype > prototype2
+    $MY_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv=vboxdrv" { $3 = "platform/i86pc/kernel/drv/vboxdrv=vboxdrv" } { print }' prototype > prototype2
 else
-    /usr/bin/awk 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv=vboxdrv" { $3 = "platform/i86pc/kernel/drv/amd64/vboxdrv=vboxdrv" } { print }' prototype > prototype2
+    $MY_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv=vboxdrv" { $3 = "platform/i86pc/kernel/drv/amd64/vboxdrv=vboxdrv" } { print }' prototype > prototype2
 fi
 
-/usr/bin/awk 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv.conf=vboxdrv.conf" { $3 = "platform/i86pc/kernel/drv/vboxdrv.conf=vboxdrv.conf" } { print }' prototype2 > prototype
+$MY_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv.conf=vboxdrv.conf" { $3 = "platform/i86pc/kernel/drv/vboxdrv.conf=vboxdrv.conf" } { print }' prototype2 > prototype
 
 rm prototype2
-pkgmk -o -r .
-pkgtrans -s -o /var/spool/pkg `pwd`/$2 SUNWvbox
-/usr/sfw/bin/gtar zcvf $2.tar.gz $2 autoresponse ReadMe.txt
-rm -rf /var/spool/pkg/SUNWvbox
 
+# explicitly set timestamp to shutup warning
+VBOXPKG_TIMESTAMP=vbox`date '+%Y%m%d%H%M%S'`
+
+# create the package instance
+pkgmk -p $VBOXPKG_TIMESTAMP -o -r .
+if test $? -ne 0; then
+    exit 1
+fi
+
+# translate into package datastream
+pkgtrans -s -o /var/spool/pkg `pwd`/$2 "$MY_PKGNAME"
+if test $? -ne 0; then
+    exit 1
+fi
+
+$MY_GTAR zcvf $2.tar.gz $2 autoresponse ReadMe.txt
+
+if test  $? -eq 0; then
+    echo "## Packaging and transfer completed successfully!"
+fi
+rm -rf "/var/spool/pkg/$MY_PKGNAME"
+exit $?
+
Index: /trunk/src/VBox/Installer/solaris/vbox.space
===================================================================
--- /trunk/src/VBox/Installer/solaris/vbox.space	(revision 8122)
+++ /trunk/src/VBox/Installer/solaris/vbox.space	(revision 8123)
@@ -1,3 +1,5 @@
 # Space file for VirtualBox installer
-opt 800 1
+# We only create a few links so we don't need much space
+# pathname blocks inodes
+/ 1000 8