VirtualBox

儲存庫 vbox 的更動 12144


忽略:
時間撮記:
2008-9-5 下午04:18:36 (16 年 以前)
作者:
vboxsync
訊息:

Solaris/additions: backed out combined installer for now.

位置:
trunk/src/VBox/Additions/solaris
檔案:
修改 3 筆資料

圖例:

未更動
新增
刪除

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

    r12134 r12144  
    2222#       makespackage.sh $(PATH_TARGET)/install packagename $(KBUILD_TARGET_ARCH)
    2323
    24 if test -z "$2"; then
    25     echo "Usage: $0 installdir packagename"
     24if test -z "$3"; then
     25    echo "Usage: $0 installdir packagename x86|amd64"
    2626    exit 1
    2727fi
    … …  
    6565filelist_fixup prototype '$2 == "none"'                                                     '$3 = "opt/VirtualBoxAdditions/"$3"="$3'
    6666
    67 # 32-bit kernel module
    68 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'              '$3 = "platform/i86pc/kernel/drv/vboxguest=vboxguest"; $6="sys"'
    69 
    70 # 64-bit kernel module
    71 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/vboxguest=amd64/vboxguest"'  '$3 = "platform/i86pc/kernel/drv/amd64/vboxguest=amd64/vboxguest"; $6="sys"'
     67# install kernel module in the right place
     68if test "3" = "x86"; then
     69    filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'           '$3 = "platform/i86pc/kernel/drv/vboxguest=vboxguest"; $6="sys"'
     70else
     71    filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'           '$3 = "platform/i86pc/kernel/drv/amd64/vboxguest=vboxguest"; $6="sys"'
     72fi
    7273
    7374# kernel module config file

  • trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

    r12134 r12144  
    2222sync
    2323vboxadditions_path="/opt/VirtualBoxAdditions"
    24 vboxadditions64_path="/opt/VirtualBoxAdditions/amd64"
    25 solaris64dir="amd64"
    2624
    2725# vboxguest.sh would've been installed, we just need to call it.
    2826$vboxadditions_path/vboxguest.sh restart silentunload
    2927
    30 # Set permissions
     28# get what ISA the guest is running
     29cputype=`isainfo -k`
     30isadir=""
     31if test "$cputype" = "amd64"; then
     32    isadir="amd64"
     33fi
     34
     35
     36# suid permissions for timesync
    3137chmod 04755 $vboxadditions_path/VBoxService
    32 chmod a+x $vboxadditions_path/VBox.sh
    3338chmod a+x $vboxadditions_path/VBoxClient
    3439chmod a+x $vboxadditions_path/VBoxControl
    3540chmod a+x $vboxadditions_path/VBoxRandR.sh
    36 chmod 04755 $vboxadditions64_path/VBoxService
    37 chmod a+x $vboxadditions64_path/VBoxClient
    38 chmod a+x $vboxadditions64_path/VBoxControl
    3941
    4042# create links
    4143echo "Creating links..."
    4244/usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s
    43 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBox.sh s
    44 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxService=$vboxadditions_path/VBox.sh s
    45 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxControl=$vboxadditions_path/VBox.sh s
     45/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBoxClient s
     46/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxService=$vboxadditions_path/VBoxService s
     47/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxControl=$vboxadditions_path/VBoxControl s
    4648/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxRandR=$vboxadditions_path/VBoxRandR.sh s
    4749
    … …  
    5557case "$xorgversion" in
    5658    1.3.* )
    57         vboxmouse_src="vboxmouse_drv_71.so"
    58         vboxvideo_src="vboxvideo_drv_13.so"
     59        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_71.so"
     60        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_13.so"
    5961        ;;
    6062    1.4.* )
    61         vboxmouse_src="vboxmouse_drv_14.so"
    62         vboxvideo_src="vboxvideo_drv_14.so"
     63        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_14.so"
     64        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_14.so"
    6365        ;;
    6466    7.1.* | *7.2.* )
    65         vboxmouse_src="vboxmouse_drv_71.so"
    66         vboxvideo_src="vboxvideo_drv_71.so"
     67        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_71.so"
     68        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_71.so"
    6769            ;;
    6870    6.9.* | 7.0.* )
    69         vboxmouse_src="vboxmouse_drv_70.so"
    70         vboxvideo_src="vboxvideo_drv_70.so"
     71        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_70.so"
     72        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_70.so"
    7173        ;;
    7274esac
    … …  
    8284    echo "Configuring Xorg..."
    8385
    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"
     86    vboxmouse_dest="/usr/X11/lib/modules/input/$isadir/vboxmouse_drv.so"
     87    vboxvideo_dest="/usr/X11/lib/modules/drivers/$isadir/vboxvideo_drv.so"
    8788    /usr/sbin/installf -c none $PKGINST "$vboxmouse_dest" f
    8889    /usr/sbin/installf -c none $PKGINST "$vboxvideo_dest" f
    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"
     90    cp "$vboxmouse_src" "$vboxmouse_dest"
     91    cp "$vboxvideo_src" "$vboxvideo_dest"
    9992
    10093    # Removing redudant files
    101     # 32-bit
    10294    /usr/sbin/removef $PKGINST $vboxadditions_path/vboxmouse_drv_* 1>/dev/null 2>/dev/null
    10395    /usr/sbin/removef $PKGINST $vboxadditions_path/vboxvideo_drv_* 1>/dev/null 2>/dev/null
    10496    rm -f $vboxadditions_path/vboxmouse_drv_*
    10597    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_*
    11298
    11399    /usr/sbin/removef -f $PKGINST

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

    r12134 r12144  
    123123        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh                         $(SOLARIS_INST_DIR)/VBoxRandR.sh
    124124        $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf  $(SOLARIS_INST_DIR)/vboxguest.conf
    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
     125        $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/additions/vboxguest                                          $(SOLARIS_INST_DIR)/vboxguest
    127126        @#$(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/vboxguest,)
    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
     127        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxClient                                      $(SOLARIS_INST_DIR)/VBoxClient
     128        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxService                                     $(SOLARIS_INST_DIR)/VBoxService
     129        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxControl                                     $(SOLARIS_INST_DIR)/VBoxControl
     130        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_13.so
     131        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_14.so
     132        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_70.so
     133        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so                                       $(SOLARIS_INST_DIR)/vboxvideo_drv_71.so
     134        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so                                       $(SOLARIS_INST_DIR)/vboxmouse_drv_14.so
     135        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so                                       $(SOLARIS_INST_DIR)/vboxmouse_drv_70.so
     136        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so                                       $(SOLARIS_INST_DIR)/vboxmouse_drv_71.so
    148137        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxdevlink.sed                  $(SOLARIS_INST_DIR)/etc/devlink.tab
    149138        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh                          $(SOLARIS_INST_DIR)/VBox.sh
    150139        $(call MSG_L1,Creating install package: $@)
    151         $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKGFILENAME)
     140        $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKGFILENAME) $(KBUILD_TARGET_ARCH)
    152141        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_INST_DIR)/$(PKGFILENAME) $(PATH_BIN)/additions/$(PKGFILENAME)
    153142
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette