Changeset 42468 in vbox

Timestamp:

Jul 31, 2012 6:53:42 AM (12 years ago)

Author:

vboxsync

Message:

Additions/solaris/installer and vboxms: add SMF service description for running vboxmslnk automatically.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/makepackage.sh (modified) (2 diffs)
• Makefile.kmk (modified) (9 diffs)
• Mouse/vboxmslnk.xml (added)

trunk/src/VBox/Additions/solaris/Installer/makepackage.sh

@@ -84 +84 @@
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxClient
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxControl
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/vboxmslnk
 
 # prepare file list
@@ -115 +116 @@
 # Manifest class action scripts
 filelist_fixup prototype '$3 == "var/svc/manifest/application/virtualbox/vboxservice.xml"'                   '$2 = "manifest";$6 = "sys"'
+filelist_fixup prototype '$3 == "var/svc/manifest/application/virtualbox/vboxmslnk.xml"'                     '$2 = "manifest";$6 = "sys"'
 
 # vboxguest
 filelist_fixup prototype '$3 == "usr/kernel/drv/vboxguest"'                                                  '$6="sys"'
 filelist_fixup prototype '$3 == "usr/kernel/drv/amd64/vboxguest"'                                            '$6="sys"'
+
+# vboxms
+filelist_fixup prototype '$3 == "usr/kernel/drv/vboxms"'                                                     '$6="sys"'
+filelist_fixup prototype '$3 == "usr/kernel/drv/amd64/vboxms"'                                               '$6="sys"'
 
 # Use 'root' as group so as to match attributes with the previous installation and prevent a conflict. Otherwise pkgadd bails out thinking

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

@@ -69 +69 @@
 
 SOLARIS_ADD_USRBIN_DIR                  := $(SOLARIS_ADDINST_OUT_DIR)/usr/bin
+SOLARIS_ADD_USRSBIN_DIR                 := $(SOLARIS_ADDINST_OUT_DIR)/usr/sbin
 SOLARIS_ADD_ETCFS_DIR                   := $(SOLARIS_ADDINST_OUT_DIR)/etc/fs/vboxfs
 SOLARIS_ADD_SERVICESINST_DIR            := $(SOLARIS_ADDINST_OUT_DIR)/var/svc/manifest/application/virtualbox
@@ -129 +130 @@
         $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop \
         $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml \
+        $(PATH_ROOT)/src/VBox/Additions/solaris/Mouse/vboxmslnk.xml \
         $(VBOX_BRAND_LICENSE_TXT)=>LICENSE
 
@@ -143 +145 @@
         usr \
         usr/bin \
+        usr/sbin \
         usr/lib \
         usr/lib/amd64 \
@@ -221 +224 @@
         VBoxControl
 
+SOLARIS_ADD_USRSBIN_LINKS = \
+        vboxmslnk
+
 SOLARIS_ADD_COMMON = \
         vboxclient.desktop \
@@ -228 +234 @@
 
 SOLARIS_ADD_SERVICES = \
-        vboxservice.xml
+        vboxservice.xml \
+        vboxmslnk.xml
 
 ifdef VBOX_COMPRESS
@@ -262 +269 @@
         $(addprefix $(SOLARIS_VBOXADDINST_DIR)/,$(SOLARIS_ADD_COMMON)) \
         $(addprefix $(SOLARIS_ADD_SERVICESINST_DIR)/,$(SOLARIS_ADD_SERVICES)) \
-        $(addprefix $(SOLARIS_ADD_USRBIN_DIR)/,$(SOLARIS_ADD_USRBIN_LINKS))
+        $(addprefix $(SOLARIS_ADD_USRBIN_DIR)/,$(SOLARIS_ADD_USRBIN_LINKS)) \
+        $(addprefix $(SOLARIS_ADD_USRSBIN_DIR)/,$(SOLARIS_ADD_USRSBIN_LINKS))
 
 
@@ -281 +289 @@
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.sh \
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml \
+                $(PATH_ROOT)/src/VBox/Additions/solaris/Mouse/vboxmslnk.xml \
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
@@ -325 +334 @@
 endif
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml                    $(SOLARIS_ADD_SERVICESINST_DIR)/vboxservice.xml
+        $(QUIET)$(INSTALL) -m 0644      $(PATH_ROOT)/src/VBox/Additions/solaris/Mouse/vboxmslnk.xml                      $(SOLARIS_ADD_SERVICESINST_DIR)/vboxmslnk.xml
         $(QUIET)$(SOLARIS_ADDINST_OUT_DIR)/makepackage.sh $(SOLARIS_ADDINST_OUT_DIR) $(PKGFILENAME) $(VBOX_SVN_REV) $(VBOX_SOL_PKG_DEV)
         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) $(PATH_STAGE_BIN)/additions/$(PKGFILENAME)
@@ -410 +420 @@
         $(LN_SYMLINK) -f ../..$(SOLARIS_VBOXADDINST_SUBDIR)/$< $@
 
+#
+# Symlinks from /usr/sbin/ to /opt/VirtualBoxAdditions
+#
+$(addprefix $(SOLARIS_ADD_USRSBIN_DIR)/,$(SOLARIS_ADD_USRSBIN_LINKS)): \
+                $(SOLARIS_ADD_USRSBIN_DIR)/% : % | $$(dir $$@)
+        $(LN_SYMLINK) -f ../..$(SOLARIS_VBOXADDINST_SUBDIR)/$< $@