diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2022-06-07 19:57:38 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2022-06-07 19:57:38 +0000 |
| commit | 04eb2fb8b2c5ecd8c2fc23e1c3471fc4e975ed55 (patch) | |
| tree | efed100e3d137fd7701e567b6d494b20e8ec0923 /src/VBox/Installer | |
| parent | 5b619bebb039cb9a916d416467decff54a4cd6c6 (diff) | |
| download | VirtualBox-svn-04eb2fb8b2c5ecd8c2fc23e1c3471fc4e975ed55.tar.gz | |
Installer: Solaris 11, IPS: Fix package naming for Alpha, Beta, RC and GA releases.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@95215 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Installer')
| -rw-r--r-- | src/VBox/Installer/solaris/Makefile.kmk | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/VBox/Installer/solaris/Makefile.kmk b/src/VBox/Installer/solaris/Makefile.kmk index 0196216c714..1e9b704f096 100644 --- a/src/VBox/Installer/solaris/Makefile.kmk +++ b/src/VBox/Installer/solaris/Makefile.kmk @@ -52,6 +52,15 @@ PKGINFO_REVSTAMP = $(PKGINFO_DATE).$(VBOX_SVN_REV) PKGINFO_PSTAMP = vbox_$(subst .,,$(PKGINFO_DATE))_r$(VBOX_SVN_REV) PKG_FILENAME := VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV) +# For Alpha, Beta, RC and releases VBOX_VERSION_STRING needs to be converted into the variant +# which complies to Solaris 11 Image Packaging System (IPS) versioning convention. For GA release, +# we add '.3.0' to the end of the version string in order to make its version look newer from +# IPS point of view. +VBOX_VERSION_SMF_STYLE := $(subst _ALPHA,.0.,$(VBOX_VERSION_STRING)) +VBOX_VERSION_SMF_STYLE := $(subst _BETA,.1.,$(VBOX_VERSION_STRING)) +VBOX_VERSION_SMF_STYLE := $(subst _RC,.2.,$(VBOX_VERSION_STRING)) +VBOX_VERSION_SMF_STYLE := $(if $(VBOX_VERSION_PRERELEASE),,$(VBOX_VERSION_STRING).3.0) +PKG_FILENAME_SMF_STYLE := VirtualBox-$(VBOX_VERSION_SMF_STYLE)-SunOS-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV) # # Targets @@ -61,12 +70,12 @@ INSTALLS += solaris-doc solaris-bin solaris-drv-confs solaris-icons BLDDIRS += $(VBOX_PATH_SI_SCRATCH) PACKING += \ $(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz \ - $(if $(VBOX_WITH_SOLARIS_IPS_PACKAGE),$(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p,) \ + $(if $(VBOX_WITH_SOLARIS_IPS_PACKAGE),$(PATH_STAGE_BIN)/$(PKG_FILENAME_SMF_STYLE).p5p,) \ $(PATH_STAGE_BIN)/VirtualBoxDebug.tar.bz2 OTHER_CLEAN += \ $(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).pkg \ $(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz \ - $(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p \ + $(PATH_STAGE_BIN)/$(PKG_FILENAME_SMF_STYLE).p5p \ $(PATH_STAGE_BIN)/VirtualBoxDebug.tar.bz2 \ $(VBOX_PATH_SI_SCRATCH)/dist-copy.ts @@ -728,20 +737,20 @@ $(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz: \ # # Creates the IPS style installer package. # -solaris-package-ips:: $(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p -$(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p: \ +solaris-package-ips:: $(PATH_STAGE_BIN)/$(PKG_FILENAME_SMF_STYLE).p5p +$(PATH_STAGE_BIN)/$(PKG_FILENAME_SMF_STYLE).p5p: \ $(VBOX_PATH_SI_SCRATCH)/dist-copy.ts \ $(VBOX_SI_DEP_ON_MAKEFILE) \ | $$(dir $$@) - $(call MSG_L1,Creating install package: $(PKG_FILENAME).p5p) + $(call MSG_L1,Creating install package: $(PKG_FILENAME_SMF_STYLE).p5p) $(VBOX_PATH_SI_SCRATCH_PKG)/makepackage.sh \ --ips \ $(if-expr defined(VBOX_WITH_HARDENING),--hardened,) \ $(VBOX_PATH_SI_SCRATCH_PKG) \ - $(PKG_FILENAME) \ + $(PKG_FILENAME_SMF_STYLE) \ $(KBUILD_TARGET_ARCH) \ $(VBOX_SVN_REV) - $(MV) -- "$(VBOX_PATH_SI_SCRATCH_PKG)/$(PKG_FILENAME).p5p" "$@" + $(MV) -- "$(VBOX_PATH_SI_SCRATCH_PKG)/$(PKG_FILENAME_SMF_STYLE).p5p" "$@" ## List of file list variable names relevant for debug info. |