VirtualBox

Changeset 12134

Show
Ignore:
Timestamp:
09/05/08 16:18:44 (3 months ago)
Author:
vboxsync
Message:

Solaris/additions: Combined 32-bit and 64-bit additions package.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/VBox/Additions/Makefile.kmk

    r11615 r12134  
    137137endif 
    138138 
    139  
     139# Solaris has only one additions package containing both 32-bit and 64-bit additions 
    140140ifdef VBOX_WITH_ADDITIONS_ISO.solaris.amd64 
    141  VBOX_PATH_ADDITIONS.solaris.amd64 = $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions 
    142  GUESTADDITIONS_FILESPEC.solaris.amd64 = \ 
    143         VBoxSolarisAdditions-amd64.pkg=$(VBOX_PATH_ADDITIONS.solaris.amd64)/VBoxSolarisAdditions.pkg 
    144 endif 
    145 ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86 
    146  VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions 
    147 ## @todo 64-bit additions: rename this package, update docs (?) and tests (?). 
    148  GUESTADDITIONS_FILESPEC.solaris.x86 = \ 
    149         VBoxSolarisAdditions-x86.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg 
    150 endif 
    151  
     141 VBOX_PATH_ADDITIONS.solaris = $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions 
     142 GUESTADDITIONS_FILESPEC.solaris = \ 
     143        VBoxSolarisAdditions.pkg=$(VBOX_PATH_ADDITIONS.solaris)/VBoxSolarisAdditions.pkg 
     144endif 
    152145 
    153146ifdef VBOX_WITH_ADDITIONS_ISO.win.amd64 
     
    224217                                $(GUESTADDITIONS_FILESPEC.win.x86) \ 
    225218                                $(GUESTADDITIONS_FILESPEC.win.amd64) \ 
    226                                 $(GUESTADDITIONS_FILESPEC.solaris.x86) \ 
    227                                 $(GUESTADDITIONS_FILESPEC.solaris.amd64) \ 
     219                                $(GUESTADDITIONS_FILESPEC.solaris) \ 
    228220                                $(GUESTADDITIONS_FILESPEC.os2.x86) \ 
    229221                                $(GUESTADDITIONS_FILESPEC.linux.x86) \ 
     
    244236                $(GUESTADDITIONS_FILESPEC.win.x86) \ 
    245237                $(GUESTADDITIONS_FILESPEC.win.amd64) \ 
    246                 $(GUESTADDITIONS_FILESPEC.solaris.x86) \ 
    247                 $(GUESTADDITIONS_FILESPEC.solaris.amd64) \ 
     238                $(GUESTADDITIONS_FILESPEC.solaris) \ 
    248239                $(GUESTADDITIONS_FILESPEC.os2.x86) \ 
    249240                $(GUESTADDITIONS_FILESPEC.linux.x86) \ 
  • trunk/src/VBox/Additions/solaris/Installer/makepackage.sh

    r9748 r12134  
    2222#       makespackage.sh $(PATH_TARGET)/install packagename $(KBUILD_TARGET_ARCH) 
    2323 
    24 if test -z "$3"; then 
    25     echo "Usage: $0 installdir packagename x86|amd64
     24if test -z "$2"; then 
     25    echo "Usage: $0 installdir packagename
    2626    exit 1 
    2727fi 
    2828 
    29 MY_PKGNAME=SUNWvboxguest 
    30 MY_GGREP=/usr/sfw/bin/ggrep 
    31 MY_AWK=/usr/bin/awk 
     29VBOX_PKGNAME=SUNWvboxguest 
     30VBOX_AWK=/usr/bin/awk 
     31VBOX_GGREP=/usr/sfw/bin/ggrep 
     32VBOX_AWK=/usr/bin/awk 
    3233 
    3334# check for GNU grep we use which might not ship with all Solaris 
    34 if test ! -f "$MY_GGREP" && test ! -h "$MY_GGREP"; then 
    35     echo "## GNU grep not found in $MY_GGREP." 
     35if test ! -f "$VBOX_GGREP" && test ! -h "$VBOX_GGREP"; then 
     36    echo "## GNU grep not found in $VBOX_GGREP." 
    3637    exit 1 
    3738fi 
     
    3940# bail out on non-zero exit status 
    4041set -e 
     42 
     43# Fixup filelist using awk, the parameters must be in awk syntax 
     44# params: filename condition action 
     45filelist_fixup() 
     46{ 
     47    "$VBOX_AWK" 'NF == 6 && '"$2"' { '"$3"' } { print }' "$1" > "tmp-$1" 
     48    mv -f "tmp-$1" "$1" 
     49} 
    4150 
    4251# prepare file list 
     
    5059fi 
    5160echo 'e sed /etc/devlink.tab ? ? ?' >> prototype 
    52 find . -print | $MY_GGREP -v -E 'prototype|makepackage.sh|vboxguest.pkginfo|postinstall.sh|preremove.sh|vboxguest.space|vboxguest.copyright' | pkgproto >> prototype 
     61find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vboxguest.pkginfo|postinstall.sh|preremove.sh|vboxguest.space|vboxguest.copyright' | pkgproto >> prototype 
    5362 
    5463# don't grok for the sed class files 
    55 $MY_AWK 'NF == 6 && $2 == "none" { $5 = "root"; $6 = "bin" } { print }' prototype > prototype2 
    56 $MY_AWK 'NF == 6 && $2 == "none" { $3 = "opt/VirtualBoxAdditions/"$3"="$3 } { print }' prototype2 > prototype 
     64filelist_fixup prototype '$2 == "none"'                                                     '$5 = "root"; $6 = "bin"' 
     65filelist_fixup prototype '$2 == "none"'                                                     '$3 = "opt/VirtualBoxAdditions/"$3"="$3' 
    5766 
    58 # install the kernel module to the right place 
    59 if test "$3" = "x86"; then 
    60     $MY_AWK 'NF == 6 && $3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest" { $3 = "platform/i86pc/kernel/drv/vboxguest=vboxguest"; $6 = "sys" } { print }' prototype > prototype2 
    61 else 
    62     $MY_AWK 'NF == 6 && $3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest" { $3 = "platform/i86pc/kernel/drv/amd64/vboxguest=vboxguest"; $6 = "sys" } { print }' prototype > prototype2 
    63 fi 
    64 $MY_AWK 'NF == 6 && $3 == "opt/VirtualBoxAdditions/vboxguest.conf=vboxguest.conf" { $3 = "platform/i86pc/kernel/drv/vboxguest.conf=vboxguest.conf" } { print }' prototype2 > prototype 
     67# 32-bit kernel module 
     68filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'              '$3 = "platform/i86pc/kernel/drv/vboxguest=vboxguest"; $6="sys"' 
    6569 
    66 # install the timesync SMF servic
    67 $MY_AWK 'NF == 6 && $3 == "opt/VirtualBoxAdditions/vboxservice.xml=vboxservice.xml" { $3 = "/var/svc/manifest/system/virtualbox/vboxservice.xml=vboxservice.xml" } { print }' prototype2 > prototype 
     70# 64-bit kernel modul
     71filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/vboxguest=amd64/vboxguest"'  '$3 = "platform/i86pc/kernel/drv/amd64/vboxguest=amd64/vboxguest"; $6="sys"' 
    6872 
    69 rm prototype2 
     73# kernel module config file 
     74filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest.conf=vboxguest.conf"'    '$3 = "platform/i86pc/kernel/drv/vboxguest.conf=vboxguest.conf"' 
     75 
     76filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxservice.xml=vboxservice.xml"'  '$3 = "var/svc/manifest/system/virtualbox/vboxservice.xml=vboxservice.xml"' 
     77echo " --- start of prototype  ---"  
     78cat prototype 
     79echo " --- end of prototype --- " 
    7080 
    7181# explicitly set timestamp to shutup warning 
     
    7686 
    7787# translate into package datastream 
    78 pkgtrans -s -o /var/spool/pkg `pwd`/$2 "$MY_PKGNAME" 
     88pkgtrans -s -o /var/spool/pkg `pwd`/$2 "$VBOX_PKGNAME" 
    7989 
    80 rm -rf "/var/spool/pkg/$MY_PKGNAME" 
     90rm -rf "/var/spool/pkg/$VBOX_PKGNAME" 
    8191exit $? 
    8292 
  • trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

    r11990 r12134  
    2222sync 
    2323vboxadditions_path="/opt/VirtualBoxAdditions" 
     24vboxadditions64_path="/opt/VirtualBoxAdditions/amd64" 
     25solaris64dir="amd64" 
    2426 
    2527# vboxguest.sh would've been installed, we just need to call it. 
    2628$vboxadditions_path/vboxguest.sh restart silentunload 
    2729 
    28 # get what ISA the guest is running 
    29 cputype=`isainfo -k` 
    30 isadir="" 
    31 if test "$cputype" = "amd64"; then 
    32     isadir="amd64" 
    33 fi 
    34  
    35  
    36 # suid permissions for timesync 
     30# Set permissions 
    3731chmod 04755 $vboxadditions_path/VBoxService 
     32chmod a+x $vboxadditions_path/VBox.sh 
    3833chmod a+x $vboxadditions_path/VBoxClient 
    3934chmod a+x $vboxadditions_path/VBoxControl 
    4035chmod a+x $vboxadditions_path/VBoxRandR.sh 
     36chmod 04755 $vboxadditions64_path/VBoxService 
     37chmod a+x $vboxadditions64_path/VBoxClient 
     38chmod a+x $vboxadditions64_path/VBoxControl 
    4139 
    4240# create links 
    4341echo "Creating links..." 
    4442/usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s 
    45 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBoxClient
    46 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxService=$vboxadditions_path/VBoxService
    47 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxControl=$vboxadditions_path/VBoxControl
     43/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBox.sh
     44/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxService=$vboxadditions_path/VBox.sh
     45/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxControl=$vboxadditions_path/VBox.sh
    4846/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxRandR=$vboxadditions_path/VBoxRandR.sh s 
    4947 
     
    5755case "$xorgversion" in 
    5856    1.3.* ) 
    59         vboxmouse_src="$vboxadditions_path/vboxmouse_drv_71.so" 
    60         vboxvideo_src="$vboxadditions_path/vboxvideo_drv_13.so" 
     57        vboxmouse_src="vboxmouse_drv_71.so" 
     58        vboxvideo_src="vboxvideo_drv_13.so" 
    6159        ;; 
    6260    1.4.* ) 
    63         vboxmouse_src="$vboxadditions_path/vboxmouse_drv_14.so" 
    64         vboxvideo_src="$vboxadditions_path/vboxvideo_drv_14.so" 
     61        vboxmouse_src="vboxmouse_drv_14.so" 
     62        vboxvideo_src="vboxvideo_drv_14.so" 
    6563        ;; 
    6664    7.1.* | *7.2.* ) 
    67         vboxmouse_src="$vboxadditions_path/vboxmouse_drv_71.so" 
    68         vboxvideo_src="$vboxadditions_path/vboxvideo_drv_71.so" 
     65        vboxmouse_src="vboxmouse_drv_71.so" 
     66        vboxvideo_src="vboxvideo_drv_71.so" 
    6967            ;; 
    7068    6.9.* | 7.0.* ) 
    71         vboxmouse_src="$vboxadditions_path/vboxmouse_drv_70.so" 
    72         vboxvideo_src="$vboxadditions_path/vboxvideo_drv_70.so" 
     69        vboxmouse_src="vboxmouse_drv_70.so" 
     70        vboxvideo_src="vboxvideo_drv_70.so" 
    7371        ;; 
    7472esac 
     
    8381else 
    8482    echo "Configuring Xorg..." 
    85     vboxmouse_dest="/usr/X11/lib/modules/input/$isadir/vboxmouse_drv.so" 
    86     vboxvideo_dest="/usr/X11/lib/modules/input/$isadir/vboxvideo_drv.so" 
     83 
     84    # 32-bit 
     85    vboxmouse_dest="/usr/X11/lib/modules/input/vboxmouse_drv.so" 
     86    vboxvideo_dest="/usr/X11/lib/modules/drivers/vboxvideo_drv.so" 
    8787    /usr/sbin/installf -c none $PKGINST "$vboxmouse_dest" f 
    8888    /usr/sbin/installf -c none $PKGINST "$vboxvideo_dest" f 
    89     cp "$vboxmouse_src" "$vboxmouse_dest" 
    90     cp "$vboxvideo_src" "$vboxvideo_dest" 
     89    cp "$vboxadditions_path/$vboxmouse_src" "$vboxmouse_dest" 
     90    cp "$vboxadditions_path/$vboxvideo_src" "$vboxvideo_dest" 
     91 
     92    # 64-bit 
     93    vboxmouse_dest="/usr/X11/lib/modules/input/$solaris64dir/vboxmouse_drv.so" 
     94    vboxvideo_dest="/usr/X11/lib/modules/drivers/$solaris64dir/vboxvideo_drv.so" 
     95    /usr/sbin/installf -c none $PKGINST "$vboxmouse_dest" f 
     96    /usr/sbin/installf -c none $PKGINST "$vboxvideo_dest" f 
     97    cp "$vboxadditions64_path/$vboxmouse_src" "$vboxmouse_dest" 
     98    cp "$vboxadditions64_path/$vboxvideo_src" "$vboxvideo_dest" 
    9199 
    92100    # Removing redudant files 
     101    # 32-bit 
    93102    /usr/sbin/removef $PKGINST $vboxadditions_path/vboxmouse_drv_* 1>/dev/null 2>/dev/null 
    94103    /usr/sbin/removef $PKGINST $vboxadditions_path/vboxvideo_drv_* 1>/dev/null 2>/dev/null 
    95104    rm -f $vboxadditions_path/vboxmouse_drv_* 
    96105    rm -f $vboxadditions_path/vboxvideo_drv_* 
     106 
     107    # 64-bit 
     108    /usr/sbin/removef $PKGINST $vboxadditions64_path/vboxmouse_drv_* 1>/dev/null 2>/dev/null 
     109    /usr/sbin/removef $PKGINST $vboxadditions64_path/vboxvideo_drv_* 1>/dev/null 2>/dev/null 
     110    rm -f $vboxadditions64_path/vboxmouse_drv_* 
     111    rm -f $vboxadditions64_path/vboxvideo_drv_* 
     112 
    97113    /usr/sbin/removef -f $PKGINST 
    98114 
  • trunk/src/VBox/Additions/solaris/Makefile.kmk

    r10129 r12134  
    4141VBOX_PATH_SOLARIS_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/Installer 
    4242VBOX_PATH_X11_ADDITION_INSTALLER     := $(PATH_ROOT)/src/VBox/Additions/x11/installer 
    43 SOLARIS_INST_DIR  := $(PATH_TARGET)/install 
    44 SOLARIS_TEMP_DIR  := $(PATH_TARGET)/tempinstall 
     43SOLARIS_INST_DIR  := $(PATH_TARGET)/install 
     44SOLARIS64_INST_DIR := $(SOLARIS_INST_DIR)/amd64 
    4545 
    4646ifeq ($(KBUILD_TYPE),debug) 
     
    7070                $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \ 
    7171                $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh \ 
    72                 $(PATH_BIN)/additions/vboxguest \ 
     72                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxguest \ 
     73                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxguest \ 
    7374                $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \ 
    7475                $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt) \ 
    75                 $(PATH_BIN)/additions/VBoxClient \ 
    76                 $(PATH_BIN)/additions/VBoxService \ 
    77                 $(PATH_BIN)/additions/VBoxControl \ 
    78                 $(PATH_BIN)/additions/vboxvideo_drv_13.so \ 
    79                 $(PATH_BIN)/additions/vboxvideo_drv_14.so \ 
    80                 $(PATH_BIN)/additions/vboxvideo_drv_70.so \ 
    81                 $(PATH_BIN)/additions/vboxvideo_drv_71.so \ 
    82                 $(PATH_BIN)/additions/vboxmouse_drv_14.so \ 
    83                 $(PATH_BIN)/additions/vboxmouse_drv_70.so \ 
    84                 $(PATH_BIN)/additions/vboxmouse_drv_71.so \ 
     76                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/VBoxClient \ 
     77                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/VBoxService \ 
     78                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/VBoxControl \ 
     79                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_13.so \ 
     80                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_14.so \ 
     81                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_70.so \ 
     82                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_71.so \ 
     83                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_14.so \ 
     84                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_70.so \ 
     85                $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_71.so \ 
     86                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/VBoxClient \ 
     87                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/VBoxService \ 
     88                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/VBoxControl \ 
     89                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_13.so \ 
     90                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_14.so \ 
     91                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_70.so \ 
     92                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_71.so \ 
     93                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_14.so \ 
     94                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_70.so \ 
     95                $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_71.so \ 
    8596                $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxdevlink.sed \ 
     97                $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh \ 
    8698                $(PATH_SUB_CURRENT)/solaris/Makefile.kmk 
    8799        $(call MSG_L1,Installing guest additions) 
    88100        @# Clear out the existing package files if needed 
    89101        $(QUIET)rm -rf $(SOLARIS_INST_DIR) 
    90         $(QUIET)rm -rf $(SOLARIS_TEMP_DIR) 
    91102        $(QUIET)$(MKDIR) -p $(SOLARIS_INST_DIR) 
     103        $(QUIET)$(MKDIR) -p $(SOLARIS64_INST_DIR) 
    92104        $(QUIET)$(MKDIR) -p $(SOLARIS_INST_DIR)/etc 
    93         $(QUIET)$(MKDIR) -p $(SOLARIS_TEMP_DIR) 
    94105        $(QUIET)$(SED) \ 
    95106                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \ 
     
    112123        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh                         $(SOLARIS_INST_DIR)/VBoxRandR.sh 
    113124        $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf  $(SOLARIS_INST_DIR)/vboxguest.conf 
    114         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/additions/vboxguest                                          $(SOLARIS_INST_DIR)/vboxguest 
     125        $(QUIET)$(INSTALL) -m 0644 $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxguest      $(SOLARIS_INST_DIR)/vboxguest 
     126        $(QUIET)$(INSTALL) -m 0644 $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxguest    $(SOLARIS64_INST_DIR)/vboxguest 
    115127        @#$(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/vboxguest,) 
    116         $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxClient                                      $(SOLARIS_INST_DIR)/VBoxClient 
    117         $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxService                                     $(SOLARIS_INST_DIR)/VBoxService 
    118         $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxControl                                     $(SOLARIS_INST_DIR)/VBoxControl 
    119         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_13.so 
    120         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_14.so 
    121         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_70.so 
    122         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_71.so 
    123         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so                                       $(SOLARIS_INST_DIR)/vboxmouse_drv_14.so 
    124         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so                                       $(SOLARIS_INST_DIR)/vboxmouse_drv_70.so 
    125         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so                                       $(SOLARIS_INST_DIR)/vboxmouse_drv_71.so 
     128        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/VBoxClient  $(SOLARIS_INST_DIR)/VBoxClient 
     129        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/VBoxService $(SOLARIS_INST_DIR)/VBoxService 
     130        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/VBoxControl $(SOLARIS_INST_DIR)/VBoxControl 
     131        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_13.so   $(SOLARIS_INST_DIR)/vboxvideo_drv_13.so 
     132        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_14.so   $(SOLARIS_INST_DIR)/vboxvideo_drv_14.so 
     133        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_70.so   $(SOLARIS_INST_DIR)/vboxvideo_drv_70.so 
     134        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_71.so   $(SOLARIS_INST_DIR)/vboxvideo_drv_71.so 
     135        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_14.so   $(SOLARIS_INST_DIR)/vboxmouse_drv_14.so 
     136        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_70.so   $(SOLARIS_INST_DIR)/vboxmouse_drv_70.so 
     137        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_71.so   $(SOLARIS_INST_DIR)/vboxmouse_drv_71.so 
     138        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/VBoxClient    $(SOLARIS64_INST_DIR)/VBoxClient 
     139        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/VBoxService   $(SOLARIS64_INST_DIR)/VBoxService 
     140        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/VBoxControl   $(SOLARIS64_INST_DIR)/VBoxControl 
     141        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_13.so $(SOLARIS64_INST_DIR)/vboxvideo_drv_13.so 
     142        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_14.so $(SOLARIS64_INST_DIR)/vboxvideo_drv_14.so 
     143        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_70.so $(SOLARIS64_INST_DIR)/vboxvideo_drv_70.so 
     144        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxvideo_drv_71.so $(SOLARIS64_INST_DIR)/vboxvideo_drv_71.so 
     145        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_14.so $(SOLARIS64_INST_DIR)/vboxmouse_drv_14.so 
     146        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_70.so $(SOLARIS64_INST_DIR)/vboxmouse_drv_70.so 
     147        $(QUIET)$(BIN_COPY) $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions/vboxmouse_drv_71.so $(SOLARIS64_INST_DIR)/vboxmouse_drv_71.so 
    126148        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxdevlink.sed                  $(SOLARIS_INST_DIR)/etc/devlink.tab 
     149        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh                          $(SOLARIS_INST_DIR)/VBox.sh 
    127150        $(call MSG_L1,Creating install package: $@) 
    128         $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKGFILENAME) $(KBUILD_TARGET_ARCH) 
     151        $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKGFILENAME) 
    129152        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_INST_DIR)/$(PKGFILENAME) $(PATH_BIN)/additions/$(PKGFILENAME) 
    130153 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy