Changeset 54028 in vbox for trunk/src/VBox/Installer/solaris
- Timestamp:
- Jan 29, 2015 3:29:44 PM (10 years ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/solaris/Makefile.kmk
r53981 r54028 29 29 # Globals 30 30 # 31 ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE ## @todo remove this when tinderclient.pl is updated.32 VBOX_WITH_COMBINED_PACKAGE := 133 endif34 31 VBOX_PATH_SOL_INST_SRC := $(PATH_SUB_CURRENT) 35 32 SOLARIS_DIR_NAME_64 := amd64 … … 86 83 PKGINFO_ARCH = $(shell uname -p) 87 84 PKGINFO_REVSTAMP = $(date %Y.%m.%d.%H.%M) 88 ifndef VBOX_WITH_COMBINED_PACKAGE 89 PKG_FILENAME = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV) 90 else 91 PKG_FILENAME = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-r$(VBOX_SVN_REV) 92 endif 85 PKG_FILENAME = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV) 93 86 94 87 # Debug package … … 457 450 $(SOLARIS_DBG_DIR)/$(DBG_ARCHIVE) 458 451 459 ifdef VBOX_WITH_COMBINED_PACKAGE 460 SOLARIS_ARCH_DEPFILES = $(addprefix $(SOLARIS_VBOXINST_DIR_64)/,$(SOLARIS_STRIP_EXES)) \ 461 $(addprefix $(SOLARIS_VBOXINST_DIR_64)/,$(SOLARIS_STRIP_BINS)) \ 462 $(addprefix $(SOLARIS_DRIVERINST_DIR_64)/,$(SOLARIS_DRIVER_BINS)) \ 463 $(addprefix $(SOLARIS_VBOXINST_DIR_64)/,$(SOLARIS_STRIP_OBJS)) \ 464 $(addprefix $(SOLARIS_VBOXINST_DIR_64)/,$(SOLARIS_NO_STRIP)) \ 465 $(addprefix $(SOLARIS_VBOXINST_DIR_64)/,$(SOLARIS_QTLIBS)) \ 466 $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_STRIP_EXES)) \ 467 $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_STRIP_BINS)) \ 468 $(addprefix $(SOLARIS_DRIVERINST_DIR_32)/,$(SOLARIS_DRIVER_BINS)) \ 469 $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_STRIP_OBJS)) \ 470 $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_NO_STRIP)) \ 471 $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_QTLIBS)) \ 472 $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_STRIP_BIN_32)) \ 473 $(wildcard $(addprefix $(SOLARIS_OUT_BIN_32)/,VBoxPython*.so)) \ 474 $(wildcard $(addprefix $(SOLARIS_OUT_BIN_64)/,VBoxPython*.so)) 475 SOLARIS_DBG_DEPFILES = $(addprefix $(SOLARIS_DBG_DIR_64)/,$(SOLARIS_DBG_FILES)) \ 476 $(addprefix $(SOLARIS_DBG_DIR_32)/,$(SOLARIS_DBG_FILES)) 477 else 478 SOLARIS_ARCH_DEPFILES = $(addprefix $(SOLARIS_VBOXINST_DIR_ISA)/,$(SOLARIS_STRIP_EXES)) \ 452 SOLARIS_ARCH_DEPFILES = $(addprefix $(SOLARIS_VBOXINST_DIR_ISA)/,$(SOLARIS_STRIP_EXES)) \ 479 453 $(addprefix $(SOLARIS_VBOXINST_DIR_ISA)/,$(SOLARIS_STRIP_BINS)) \ 480 454 $(addprefix $(SOLARIS_DRIVERINST_DIR_ISA)/,$(SOLARIS_DRIVER_BINS)) \ … … 486 460 $(addprefix $(SOLARIS_VBOXINST_DIR_ISA)/,$(SOLARIS_QTLIBS)) \ 487 461 $(wildcard $(addprefix $(SOLARIS_OUT_BIN)/,VBoxPython*.so)) 488 SOLARIS_DBG_DEPFILES = $(addprefix $(SOLARIS_DBG_DIR_ISA)/,$(SOLARIS_DBG_FILES)) 489 endif 490 SOLARIS_ARCH_DEPFILES +=$(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON)) \462 SOLARIS_DBG_DEPFILES = \ 463 $(addprefix $(SOLARIS_DBG_DIR_ISA)/,$(SOLARIS_DBG_FILES)) 464 $(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON)) \ 491 465 $(addprefix $(SOLARIS_DRIVERINST_DIR)/,$(SOLARIS_DRIVER_CONFS)) \ 492 466 $(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON_EXES)) \ … … 575 549 $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/VirtualBox-*-r*.tar.gz) 576 550 $(call MSG_L1,Installing binaries $(SOLARIS_VBOXINST_DIR)) 577 ifdef VBOX_WITH_COMBINED_PACKAGE578 $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN_32)/additions/VBoxGuestAdditions.iso $(SOLARIS_VBOXINST_DIR)/additions/)579 else580 551 $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN)/additions/VBoxGuestAdditions.iso $(SOLARIS_VBOXINST_DIR)/additions/) 581 endif582 552 $(call MSG_L1,Installing files $(SOLARIS_VBOXINST_DIR)) 583 553 $(QUIET)$(SED) \ … … 603 573 #$(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE $(SOLARIS_BASEINST_DIR)/vbox.copyright 604 574 $(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE $(SOLARIS_BASEINST_DIR)/LICENSE 605 ifdef VBOX_WITH_COMBINED_PACKAGE 606 ifndef VBOX_OSE 607 $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.x86/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2 $(SOLARIS_VBOXINST_DIR_32)/libSDL-1.2.so.0,) 608 $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.amd64/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2 $(SOLARIS_VBOXINST_DIR_64)/libSDL-1.2.so.0,) 609 endif 575 ifndef VBOX_OSE 576 $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS_TRG)/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2 $(SOLARIS_VBOXINST_DIR_ISA)/libSDL-1.2.so.0,) 577 endif 610 578 @# @todo -XXX- how to get rid of this manual MKDIR ? 611 $(QUIET)$(MKDIR) -p $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64) 612 $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(wildcard $(SOLARIS_OUT_BIN_32)/VBoxPython*.so) $(SOLARIS_VBOXINST_DIR)/,) 613 $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(wildcard $(SOLARIS_OUT_BIN_64)/VBoxPython*.so) $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64)/,) 614 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(if ($VBOX_WITH_QT4_SUN),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_32)/bin/qtconfig $(SOLARIS_VBOXINST_DIR_32)/VBoxQtconfig,),) 615 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(if $(VBOX_WITH_QT4_SUN),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_64)/bin/qtconfig $(SOLARIS_VBOXINST_DIR_64)/VBoxQtconfig,),) 616 $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN_32)/VBoxISAExec $(SOLARIS_VBOXINST_DIR)/VBoxISAExec 617 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../rdesktop-vrdp-keymaps $(SOLARIS_VBOXINST_DIR_32)/rdesktop-vrdp-keymaps,) 618 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../rdesktop-vrdp-keymaps $(SOLARIS_VBOXINST_DIR_64)/rdesktop-vrdp-keymaps,) 619 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../additions $(SOLARIS_VBOXINST_DIR_32)/additions,) 620 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../additions $(SOLARIS_VBOXINST_DIR_64)/additions,) 621 $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI32.fd $(SOLARIS_VBOXINST_DIR_32)/,) 622 $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI32.fd $(SOLARIS_VBOXINST_DIR_64)/,) 623 $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd $(SOLARIS_VBOXINST_DIR_32)/,) 624 $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd $(SOLARIS_VBOXINST_DIR_64)/,) 625 else 626 ifndef VBOX_OSE 627 $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS_TRG)/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2 $(SOLARIS_VBOXINST_DIR_ISA)/libSDL-1.2.so.0,) 628 endif 629 @# @todo -XXX- how to get rid of this manual MKDIR ? 630 ifdef VBOX_WITH_PYTHON 579 ifdef VBOX_WITH_PYTHON 631 580 $(QUIET)$(if $(SOL64_PKG),$(MKDIR) -p $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64),) 632 581 ifdef VBOX_WITH_32_ON_64_MAIN_API 633 582 $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(filter %_x86.so,$(wildcard $(SOLARIS_OUT_BIN)/VBoxPython*.so)) $(SOLARIS_VBOXINST_DIR)/ 634 583 $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(filter-out %_x86.so,$(wildcard $(SOLARIS_OUT_BIN)/VBoxPython*.so)) $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64)/ 635 584 else 636 585 $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(wildcard $(SOLARIS_OUT_BIN)/VBoxPython*.so) $(SOLARIS_VBOXINST_DIR)/$(if $(SOL64_PKG),$(VBOX_SOL_PYTHON_DIR_64)/,) 637 endif638 586 endif 587 endif 639 588 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(if $(VBOX_WITH_QT4_SUN),$(INSTALL) -m 0755 $(VBOX_PATH_QT4)/bin/qtconfig $(SOLARIS_VBOXINST_DIR_ISA)/VBoxQtconfig,),) 640 589 $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN)/VBoxISAExec $(SOLARIS_VBOXINST_DIR)/VBoxISAExec … … 643 592 $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI32.fd $(SOLARIS_VBOXINST_DIR_ISA)/,) 644 593 $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd $(SOLARIS_VBOXINST_DIR_ISA)/,) 645 endif646 594 $(QUIET)$(LN_SYMLINK) -f ./pkginstall.sh $(SOLARIS_VBOXINST_DIR)/ipsinstall.sh 647 595 $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../../$(SOLARIS_VBOXINST_SUBDIR)/VBox.sh $(SOLARIS_USRBIN_DIR)/VBoxQtconfig,) … … 702 650 $(SOLARIS_BASEINST_DIR) \ 703 651 $(PKG_FILENAME) \ 704 $( if-expr defined(VBOX_WITH_COMBINED_PACKAGE),neutral,$(KBUILD_TARGET_ARCH)) \652 $(KBUILD_TARGET_ARCH) \ 705 653 $(VBOX_SVN_REV) \ 706 654 $(call MSG_L1,Creating final tar.gz package)
Note:
See TracChangeset
for help on using the changeset viewer.
