Changeset 89370 in vbox

Timestamp:

May 28, 2021 7:24:37 PM (3 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.

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/linux/SUPDrv-linux.c (modified) (2 diffs)
• linux/export_modules.sh (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -93 +93 @@
 #define VBoxDrvLinuxIOCtl RT_CONCAT(VBoxDrvLinuxIOCtl_,VBoxDrvLinuxVersion)
 
+/* Once externally provided, this string will be printed into kernel log on
+ * module start together with the rest of versioning information. */
+#ifndef VBOX_EXTRA_VERSION_STRING
+# define VBOX_EXTRA_VERSION_STRING ""
+#endif
 
 
@@ -361 +366 @@
                         LogFlow(("VBoxDrv::ModuleInit returning %#x\n", rc));
                         printk(KERN_DEBUG "vboxdrv: Successfully loaded version "
-                                VBOX_VERSION_STRING " (interface " RT_XSTR(SUPDRV_IOC_VERSION) ")\n");
+                                VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV)
+                                VBOX_EXTRA_VERSION_STRING
+                                " (interface " RT_XSTR(SUPDRV_IOC_VERSION) ")\n");
                         return rc;
                     }

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