Changeset 89370 in vbox for trunk/src/VBox/HostDrivers/linux/export_modules.sh

Timestamp:

May 28, 2021 7:24:37 PM (4 years ago)

Author:

vboxsync

Message:

Host drivers: SUPDrv-linux: print revision number and optional extra version string on module load, bugref:9958.

Also, export_modules.sh was extended with --override-svn-rev
and --extra-version-string optional command line parameters in
order to get more flexibility when creating src tar for kmod SRPM
package.

File:

• trunk/src/VBox/HostDrivers/linux/export_modules.sh (modified) (4 diffs)

trunk/src/VBox/HostDrivers/linux/export_modules.sh

@@ -32 +32 @@
 # What this script does:
 usage_msg="\
-Usage: `basename ${0}` --file <path>|--folder <path> [--without-hardening]
+Usage: `basename ${0}` --file <path>|--folder <path> \
+    [--override-svn-rev <rev>] [--extra-version-string <string>] [--without-hardening]
 
 Exports the VirtualBox host kernel modules to the tar.gz archive or folder in \
@@ -68 +69 @@
         FOLDER="${2}"
         shift 2 ;;
+    --override-svn-rev)
+        OVERRIDE_SVN_REV="${2}"
+        shift 2 ;;
+    --extra-version-string)
+        EXTRA_VERSION_STRING="${2}"
+        shift 2 ;;
     --without-hardening)
         unset VBOX_WITH_HARDENING
@@ -104 +111 @@
 VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
 VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk`
-if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
+
+if [ -n "$OVERRIDE_SVN_REV" ]; then
+    VBOX_SVN_REV=$OVERRIDE_SVN_REV
+elif [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
     VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
 else
@@ -136 +146 @@
 echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_STRING\"" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_API_VERSION_STRING \"${VBOX_VERSION_MAJOR}_${VBOX_VERSION_MINOR}\"" >> $PATH_TMP/version-generated.h
+[ -n "$EXTRA_VERSION_STRING" ] && echo "#define VBOX_EXTRA_VERSION_STRING \" ${EXTRA_VERSION_STRING}\"" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_PRIVATE_BUILD_DESC \"Private build with export_modules\"" >> $PATH_TMP/version-generated.h
 echo "" >> $PATH_TMP/version-generated.h