Split the SUNWvbox.pkg rule into two so that files can be installed into the default layout without building the package file. --- VirtualBox-7.0.18/src/VBox/Installer/solaris/Makefile.kmk.orig +++ VirtualBox-7.0.18/src/VBox/Installer/solaris/Makefile.kmk @@ -545,7 +545,6 @@ $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \ $(VBOX_PATH_SOL_INST_SRC)/vbox-ips.mog \ \ - $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \ $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL), $(KBUILD_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \ \ $(foreach var, $(SOLARIS_FILE_LIST_VARS),$(foreach file, $($(var)), $($(var).SRC)/$(file))) \ @@ -598,8 +597,6 @@ "$($(var).SRC)/$(file)" "$($(var).DST)/$(file)"))) # VirtualBox: Common files. - $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING) \ - ,$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/,) $(LN_SYMLINK) -f ./pkginstall.sh $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ipsinstall.sh $(SED) -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,)/" \ --output $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/vboxconfig.sh \ @@ -613,9 +610,6 @@ $(NLTAB)$(CHMOD) 0755 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/vboxshell.py,) # VirtualBox: Arch specific files. - $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING) \ - ,$(NLTAB)$(LN_SYMLINK) ../VBoxGuestAdditions.iso $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,) - $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL) \ ,$(INSTALL) -s -m 0644 $(KBUILD_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2 \ $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/libSDL-1.2.so.0,) @@ -678,7 +672,7 @@ # Creates the System V style installer package. # solaris-package:: $(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).pkg -$(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).pkg: \ +solaris-install:: \ $(VBOX_PATH_SI_SCRATCH)/dist-copy.ts \ $(VBOX_SI_DEP_ON_MAKEFILE) \ | $$(dir $$@)