Changeset 41101 in vbox for trunk/src/VBox/Installer

Timestamp:

Apr 30, 2012 3:27:15 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77698

Message:

Solaris/Installer: Remove VBI bits.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (10 diffs)
• vboxconfig.sh (modified) (2 diffs)

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

@@ -63 +63 @@
 SOLARIS_DBG_DIR_32         := $(SOLARIS_DBG_DIR)/$(SOLARIS_DIR_NAME_32)
 SOLARIS_DBG_DIR_64         := $(SOLARIS_DBG_DIR)/$(SOLARIS_DIR_NAME_64)
-SOLARIS_VBI_DIR            := $(SOLARIS_INST_OUT_DIR)/KernelPkg
 
 ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -109 +108 @@
         $(SOLARIS_BASEINST_DIR) \
         $(SOLARIS_VBOXINST_DIR) \
-        $(SOLARIS_VBI_DIR) \
         $(SOLARIS_DBG_DIR)
 
@@ -439 +437 @@
         $(addprefix $(SOLARIS_DBG_DIR)/,$(SOLARIS_DRIVER_BINS)) \
         $(addprefix $(SOLARIS_DBG_DIR)/,$(SOLARIS_STRIP_EXES)) \
-        $(SOLARIS_DBG_DIR)/$(DBG_ARCHIVE) \
-        $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).tar.gz \
-        $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg
+        $(SOLARIS_DBG_DIR)/$(DBG_ARCHIVE)
 
 ifdef VBOX_WITH_COMBINED_PACKAGE
@@ -502 +498 @@
 
 BLDDIRS += $(foreach d,\
-        amd64 \
-,$(SOLARIS_VBI_DIR)/$(d)/)
-
-BLDDIRS += $(foreach d,\
         additions \
         components \
@@ -522 +514 @@
 SOLARIS_TAR_GZ_FILES := \
         $(PKG_FILENAME).pkg \
-        $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,) \
         LICENSE \
         autoresponse \
@@ -550 +541 @@
                 $(PATH_ROOT)/doc/ReadMe-Solaris.txt \
                 $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \
-                $(if $(VBOX_WITH_SOLARIS_VBI),$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg,) \
                 $(VBOX_BRAND_LICENSE_TXT) \
                 $(PATH_STAGE_BIN)/LICENSE \
@@ -678 +668 @@
                 --output $(SOLARIS_BASEINST_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_BASEINST_DIR)/$(VBIPKG_FILENAME).pkg,)
         $(call MSG_L1,Creating install package: $(PKG_FILENAME).tar.gz)
         $(QUIET)$(REDIRECT) -C $(VBOX_PATH_SOL_INST_SRC) -- $(SOLARIS_BASEINST_DIR)/makepackage.sh $(if $(VBOX_WITH_HARDENING),--hardened) \
@@ -685 +674 @@
                 $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),neutral,$(KBUILD_TARGET_ARCH)) \
                 $(VBOX_SVN_REV) \
-                $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,)
         $(call MSG_L1,Creating final tar.gz package)
         $(QUIET)$(SOL_GTAR) -C $(SOLARIS_BASEINST_DIR) -zcvf $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).tar.gz $(SOLARIS_TAR_GZ_FILES)
@@ -692 +680 @@
         $(QUIET)$(RM) -f $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).tar.gz
         $(QUIET)$(RM) -f $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).pkg
-        $(QUIET)$(if $(VBOX_WITH_SOLARIS_VBI),$(RM) -f $(SOLARIS_BASEINST_DIR)/$(VBIPKG_FILENAME).pkg,)
         $(call MSG_L1,Packaging completed.)
 
@@ -792 +779 @@
         $(LN_SYMLINK) -f ../../$(SOLARIS_VBOXINST_SUBDIR)/VBox.sh $@
 
-
-#
-#  -=-=-=-=-=-=-=- VBI package -=-=-=-=-=-=-=-
-#
-ifdef VBOX_WITH_SOLARIS_VBI
-$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg: \
-                $(VBOX_VERSION_STAMP) \
-                $(VBOX_BRAND_LICENSE_TXT) \
-                $(PATH_STAGE_BIN)/LICENSE \
-                $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo \
-                $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh \
-                $(VBOX_PATH_SOL_INST_SRC)/vbi/preremove.sh \
-                $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \
-                $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi \
-                $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris/vbi/64/vbi
-        $(call MSG_L1,Installing vbi binaries $(SOLARIS_VBI_DIR))
-        $(QUIET)$(RM) -Rf $(SOLARIS_VBI_DIR)
-        $(QUIET)$(MKDIR) -p $(SOLARIS_VBI_DIR)/amd64
-        $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi                       $(SOLARIS_VBI_DIR)/vbi
-        $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris/vbi/64/vbi                       $(SOLARIS_VBI_DIR)/amd64/vbi
-        $(call MSG_L1,Installing other files $(SOLARIS_VBI_DIR))
-        $(QUIET)$(SED) \
-                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
-                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
-                -e "s/@VBOX_VERSION_REVSTAMP@/$(PKGINFO_REVSTAMP)/g" \
-                -e "s/@UNAME_P@/$(PKGINFO_ARCH)/g" \
-                --output $(SOLARIS_VBI_DIR)/vboxkern.pkginfo \
-                $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo
-        # don't display the license on package install, since 4.0
-        #$(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE                                                          $(SOLARIS_VBI_DIR)/vbox.copyright
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh                                 $(SOLARIS_VBI_DIR)/makepackage.sh
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/preremove.sh                                   $(SOLARIS_VBI_DIR)/preremove.sh
-        $(call MSG_L1,Creating install package: $(VBIPKG_FILENAME).pkg)
-        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_SOL_INST_SRC) -- $(SOLARIS_VBI_DIR)/makepackage.sh $(SOLARIS_VBI_DIR) $(VBIPKG_FILENAME)
-endif
 
 

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -59 +59 @@
 MOD_VBOXBOW=vboxbow
 DESC_VBOXBOW="NetFilter (Crossbow)"
-
-# No Separate VBI since (3.1)
-#MOD_VBI=vbi
-#DESC_VBI="Kernel Interface"
 
 MOD_VBOXUSBMON=vboxusbmon
@@ -683 +679 @@
     unload_module "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$fatal"
     rem_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$fatal"
-
-# No separate VBI since 3.1
-#    unload_module "$MOD_VBI" "$DESC_VBI" "$fatal"
 
     # remove devlinks