1 ------------------------------------------------------------------------
2 r82582 | vboxsync | 2019-12-13 17:49:00 +0100 (piÄ…, 13 gru 2019) | 3 lines
4 Additions/linux/export_modules.sh: adjust to use proper svn rev fallback
5 HostDrivers/linux/export_modules.sh: adjust to use proper svn rev fallback and use the setting from Config.kmk to decide whether vboxpci should be included or not
8 Index: src/VBox/HostDrivers/linux/export_modules.sh
9 ===================================================================
10 --- src/VBox/HostDrivers/linux/export_modules.sh (revision 82581)
11 +++ src/VBox/HostDrivers/linux/export_modules.sh (revision 82582)
13 VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
14 VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
15 VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
16 -VBOX_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`
17 +VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
18 +VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
19 +VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk`
20 +if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
21 + VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
23 + VBOX_SVN_REV=$VBOX_SVN_VERSION_REV
25 +VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
26 +VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
27 +VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
28 +VBOX_C_YEAR=`date +%Y`
29 +VBOX_WITH_PCI_PASSTHROUGH=`sed -e "s/^ *VBOX_WITH_PCI_PASSTHROUGH *= *\(1\?\)/\1/;t;d" $PATH_ROOT/Config.kmk`
31 . $PATH_VBOXDRV/linux/files_vboxdrv
32 . $PATH_VBOXNET/linux/files_vboxnetflt
33 . $PATH_VBOXADP/linux/files_vboxnetadp
34 -. $PATH_VBOXPCI/linux/files_vboxpci
35 +if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then
36 + . $PATH_VBOXPCI/linux/files_vboxpci
39 # Temporary path for creating the modules, will be removed later
44 # vboxpci (VirtualBox host PCI access kernel module)
45 -mkdir $PATH_TMP/vboxpci || exit 1
46 -for f in $VBOX_VBOXPCI_SOURCES; do
47 - install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`"
49 -if [ -n "$VBOX_WITH_HARDENING" ]; then
50 - cat $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
52 - sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
53 +if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then
54 + mkdir $PATH_TMP/vboxpci || exit 1
55 + for f in $VBOX_VBOXPCI_SOURCES; do
56 + install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`"
58 + if [ -n "$VBOX_WITH_HARDENING" ]; then
59 + cat $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
61 + sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
65 install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile
66 Index: src/VBox/Additions/linux/export_modules.sh
67 ===================================================================
68 --- src/VBox/Additions/linux/export_modules.sh (revision 82581)
69 +++ src/VBox/Additions/linux/export_modules.sh (revision 82582)
71 VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
72 VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
73 VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
74 -VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
75 +VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
76 +VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk`
77 +if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
78 + VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
80 + VBOX_SVN_REV=$VBOX_SVN_VERSION_REV
82 VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
83 VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
84 VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
86 ------------------------------------------------------------------------