components/sysutils/virtualbox/patches/06-solaris-install-without-additions.patch

   1
   2 Split the SUNWvbox.pkg rule into two so that files can be installed into
   3 the default layout without building the package file.
   4
   5 --- VirtualBox-7.0.18/src/VBox/Installer/solaris/Makefile.kmk.orig
   6 +++ VirtualBox-7.0.18/src/VBox/Installer/solaris/Makefile.kmk
   7 @@ -545,7 +545,6 @@
   8                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
   9                 $(VBOX_PATH_SOL_INST_SRC)/vbox-ips.mog \
  10                 \
  11 -               $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \
  12                 $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL), $(KBUILD_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
  13                 \
  14                 $(foreach var, $(SOLARIS_FILE_LIST_VARS),$(foreach file, $($(var)), $($(var).SRC)/$(file))) \
  15 @@ -598,8 +597,6 @@
  16                 "$($(var).SRC)/$(file)" "$($(var).DST)/$(file)")))
  17
  18  # VirtualBox: Common files.
  19 -       $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING) \
  20 -       ,$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso  $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/,)
  21         $(LN_SYMLINK) -f ./pkginstall.sh $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ipsinstall.sh
  22         $(SED) -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,)/" \
  23                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/vboxconfig.sh \
  24 @@ -613,9 +610,6 @@
  25         $(NLTAB)$(CHMOD) 0755 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/vboxshell.py,)
  26
  27  # VirtualBox: Arch specific files.
  28 -       $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING) \
  29 -       ,$(NLTAB)$(LN_SYMLINK) ../VBoxGuestAdditions.iso $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,)
  30 -
  31         $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL) \
  32         ,$(INSTALL) -s -m 0644 $(KBUILD_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2 \
  33                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/libSDL-1.2.so.0,)
  34 @@ -678,7 +672,7 @@
  35  # Creates the System V style installer package.
  36  #
  37  solaris-package:: $(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).pkg
  38 -$(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).pkg: \
  39 +solaris-install:: \
  40                 $(VBOX_PATH_SI_SCRATCH)/dist-copy.ts \
  41                 $(VBOX_SI_DEP_ON_MAKEFILE) \
  42                 | $$(dir $$@)