Changeset 30099 in vbox for trunk/src

Timestamp:

Jun 9, 2010 8:27:36 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: do tar.gz creation from Makefile.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (4 diffs)
• makepackage.sh (modified) (3 diffs)

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

@@ -73 +73 @@
 endif
 SOL_OBJCOPY                  := /usr/sfw/bin/gobjcopy --strip-unneeded -R .comment
+SOL_GTAR                     := /usr/sfw/bin/gtar
 
 
@@ -481 +482 @@
 ,$(SOLARIS_DBG_DIR)/$(d))
 
+# List of files to be tar.gz'd, the files will be
+# installed in $(SOLARIS_BASEINST_DIR) and .gz'd from there.
+SOLARIS_TAR_GZ_FILES := \
+        $(PKG_FILENAME).pkg \
+        $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,) \
+        LICENSE \
+        autoresponse \
+        ReadMe.txt
 
 include $(KBUILD_PATH)/subfooter.kmk
@@ -622 +631 @@
                 $(VBOX_SVN_REV) \
                 $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,)
+        $(call MSG_L1,Creating final tar.gz package)
+        $(QUIET)$(SOL_GTAR) -C $(SOLARIS_BASEINST_DIR) -zcvf $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).tar.gz $(SOLARIS_TAR_GZ_FILES)
         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).tar.gz $(SOLARIS_OUT_BIN)
         @# Clean up files emitted as side-effect or result of packing
@@ -627 +638 @@
         $(QUIET)$(RM) -f $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).pkg
         $(QUIET)$(if $(VBOX_WITH_SOLARIS_VBI),$(RM) -f $(SOLARIS_BASEINST_DIR)/$(VBIPKG_FILENAME).pkg,)
+        $(call MSG_L1,Packaging completed.)
 
 

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

@@ -54 +54 @@
 VBOX_GGREP=/usr/sfw/bin/ggrep
 VBOX_AWK=/usr/bin/awk
-VBOX_GTAR=/usr/sfw/bin/gtar
+#VBOX_GTAR=/usr/sfw/bin/gtar
 
 # check for GNU grep we use which might not ship with all Solaris
@@ -63 +63 @@
 
 # check for GNU tar we use which might not ship with all Solaris
-if test ! -f "$VBOX_GTAR" && test ! -h "$VBOX_GTAR"; then
-    echo "## GNU tar not found in $VBOX_GTAR."
-    exit 1
-fi
+#if test ! -f "$VBOX_GTAR" && test ! -h "$VBOX_GTAR"; then
+#    echo "## GNU tar not found in $VBOX_GTAR."
+#    exit 1
+#fi
 
 # bail out on non-zero exit status
@@ -211 +211 @@
 
 # $5 if exist would contain the path to the VBI package to include in the .tar.gz
-if [ -f LICENSE ]; then
-    VBOX_LICENSEFILE=LICENSE
-fi
-if test -f "$5"; then
-    $VBOX_GTAR zcvf "$VBOX_ARCHIVE" $VBOX_LICENSEFILE "$VBOX_PKGFILE" "$5" autoresponse ReadMe.txt
-else
-    $VBOX_GTAR zcvf "$VBOX_ARCHIVE" $VBOX_LICENSEFILE "$VBOX_PKGFILE" autoresponse ReadMe.txt
-fi
-
-echo "## Packaging and transfer completed successfully!"
+#if [ -f LICENSE ]; then
+#    VBOX_LICENSEFILE=LICENSE
+#fi
+#if test -f "$5"; then
+#    $VBOX_GTAR zcvf "$VBOX_ARCHIVE" $VBOX_LICENSEFILE "$VBOX_PKGFILE" "$5" autoresponse ReadMe.txt
+#else
+#    $VBOX_GTAR zcvf "$VBOX_ARCHIVE" $VBOX_LICENSEFILE "$VBOX_PKGFILE" autoresponse ReadMe.txt
+#fi
+
+echo "## Package file created successfully!"
 rm -rf "/var/spool/pkg/$VBOX_PKGNAME"