VirtualBox

vbox的更動 69152 路徑 trunk/src/VBox


忽略:
時間撮記:
2017-10-20 下午04:09:57 (7 年 以前)
作者:
vboxsync
訊息:

Linux drivers: fix export scripts.
burgref:9009: Release process: improvements

The introduction of Version.kmk also silently broke the export_modules
scripts. This change fixes that and also makes them test build the
exported modules and warn non-fatally if they cannot be built.

位置:
trunk/src/VBox
檔案:
修改 2 筆資料

圖例:

未更動
新增
刪除

  • trunk/src/VBox/Additions/linux/export_modules

    r59768 r69152  
    3030FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
    3131PATH_ROOT="`cd ${MY_DIR}/../../../..; pwd`"
     32PATH_LOG=/tmp/vbox-export-guest.log
    3233PATH_LINUX="$PATH_ROOT/src/VBox/Additions/linux"
    3334PATH_VBOXGUEST="$PATH_ROOT/src/VBox/Additions/common/VBoxGuest"
    … …  
    3536PATH_VBOXVIDEO="$PATH_ROOT/src/VBox/Additions/linux/drm"
    3637
    37 VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
    38 VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
    39 VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
     38VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
     39VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
     40VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
    4041VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
    4142VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
    … …  
    111112    install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxvideo/`echo $f|cut -d'>' -f2`"
    112113done
     114sed -f $PATH_VBOXVIDEO/indent.sed -i $PATH_TMP/vboxvideo/*.[ch]
    113115
    114116# convenience Makefile
    … …  
    120122rm $PATH_TMP/product-generated.h
    121123
     124# Do a test build
     125echo Doing a test build, this may take a while.
     126make -C $PATH_TMP > $PATH_LOG 2>&1 &&
     127    make -C $PATH_TMP clean >> $PATH_LOG 2>&1 ||
     128    echo "Warning: test build failed.  Please check $PATH_LOG"
     129
    122130# Create the archive
    123131tar -czf $FILE_OUT -C $PATH_TMP . || exit 1

  • trunk/src/VBox/HostDrivers/linux/export_modules

    r58844 r69152  
    3434FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
    3535PATH_ROOT="`cd ${MY_DIR}/../../../..; pwd`"
     36PATH_LOG=/tmp/vbox-export-host.log
    3637PATH_LINUX="$PATH_ROOT/src/VBox/HostDrivers/linux"
    3738PATH_VBOXDRV="$PATH_ROOT/src/VBox/HostDrivers/Support"
    … …  
    4041PATH_VBOXPCI="$PATH_ROOT/src/VBox/HostDrivers/VBoxPci"
    4142
    42 VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
    43 VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
    44 VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
     43VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
     44VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
     45VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
    4546VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
    4647VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`                                                                                                        VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                                     VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                         VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                                   VBOX_C_YEAR=`date +%Y`
    … …  
    148149rm $PATH_TMP/product-generated.h
    149150
     151# Do a test build
     152echo Doing a test build, this may take a while.
     153make -C $PATH_TMP > $PATH_LOG 2>&1 &&
     154    make -C $PATH_TMP clean >> $PATH_LOG 2>&1 ||
     155    echo "Warning: test build failed.  Please check $PATH_LOG"
     156
    150157# Create the archive
    151158tar -czf $FILE_OUT -C $PATH_TMP . || exit 1
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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