Changeset 9159 in vbox for trunk/src/VBox

Timestamp:

May 27, 2008 1:53:14 PM (17 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (6 diffs)
• makepackage.sh (modified) (1 diff)

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

@@ -47 +47 @@
 # Targets
 INSTALLS         = solaris-doc
-PACKING          = $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(VBIPKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE)
+PACKING          = $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE)
 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)
-        $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKG_FILENAME) $(KBUILD_TARGET_ARCH)
+        $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKG_FILENAME) $(KBUILD_TARGET_ARCH) $(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
-        $(call MSG_L1,Creating install package: $(VBIPKG_FILENAME).tar.gz)
+        $(call MSG_L1,Creating install package: $(VBIPKG_FILENAME).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"
 
-$VBOX_GTAR zcvf "$VBOX_ARCHIVE" "$VBOX_PKGFILE" autoresponse ReadMe.txt
+# $4 if exist would contain the path to the VBI package to include in the .tar.gz
+if test -f "$4"; then
+    $VBOX_GTAR zcvf "$VBOX_ARCHIVE" "$VBOX_PKGFILE" $4 autoresponse ReadMe.txt
+else
+    $VBOX_GTAR zcvf "$VBOX_ARCHIVE" "$VBOX_PKGFILE" autoresponse ReadMe.txt
+fi
 
 echo "## Packaging and transfer completed successfully!"