VirtualBox

Changeset 60584 in vbox


Ignore:
Timestamp:
Apr 20, 2016 9:40:50 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
106719
Message:

Linux host/guest modules: include the revision into the Linux kernel modules (for modinfo MODULE.ko)

Location:
trunk/src/VBox
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

    r58113 r60584  
    3838#include <linux/poll.h>
    3939#include <VBox/version.h>
     40#include "revision-generated.h"
    4041
    4142#include <iprt/assert.h>
    … …  
    10821083MODULE_LICENSE("GPL");
    10831084#ifdef MODULE_VERSION
    1084 MODULE_VERSION(VBOX_VERSION_STRING);
    1085 #endif
    1086 
     1085MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV));
     1086#endif
     1087

  • trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

    r59978 r60584  
    1919FILES_VBOXVIDEO_DRM_NOBIN=" \
    2020    ${PATH_OUT}/version-generated.h=>version-generated.h \
     21    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
    2122    ${PATH_OUT}/product-generated.h=>product-generated.h \
    2223    ${PATH_ROOT}/include/iprt/asm.h=>include/iprt/asm.h \

  • trunk/src/VBox/Additions/linux/drm/vbox_drv.c

    r60352 r60584  
    4949
    5050#include <VBox/VBoxGuest.h>
     51#include "version-generated.h"
     52#include "revision-generated.h"
    5153
    5254#include <linux/module.h>
    … …  
    294296MODULE_DESCRIPTION(DRIVER_DESC);
    295297MODULE_LICENSE("GPL and additional rights");
    296 
     298#ifdef MODULE_VERSION
     299MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV));
     300#endif

  • trunk/src/VBox/Additions/linux/sharedfolders/files_vboxsf

    r58203 r60584  
    8585    ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/vfsmod.h=>vfsmod.h \
    8686    ${PATH_OUT}/version-generated.h=>version-generated.h \
     87    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
    8788    ${PATH_OUT}/product-generated.h=>product-generated.h \
    8889"

  • trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

    r58196 r60584  
    3535MODULE_LICENSE("GPL");
    3636#ifdef MODULE_VERSION
    37 MODULE_VERSION(VBOX_VERSION_STRING " (interface " RT_XSTR(VMMDEV_VERSION) ")");
     37MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV));
    3838#endif
    3939

  • trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

    r58203 r60584  
    2121#include "the-linux-kernel.h"
    2222#include "version-generated.h"
     23#include "revision-generated.h"
    2324#include "product-generated.h"
    2425#include <VBox/log.h>

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

    r58873 r60584  
    3434#include "version-generated.h"
    3535#include "product-generated.h"
     36#include "revision-generated.h"
    3637
    3738#include <iprt/assert.h>
    … …  
    15121513MODULE_LICENSE("GPL");
    15131514#ifdef MODULE_VERSION
    1514 MODULE_VERSION(VBOX_VERSION_STRING " (" RT_XSTR(SUPDRV_IOC_VERSION) ")");
     1515MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV) " (" RT_XSTR(SUPDRV_IOC_VERSION) ")");
    15151516#endif
    15161517

  • trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

    r58273 r60584  
    201201    ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \
    202202    ${PATH_OUT}/version-generated.h=>version-generated.h \
     203    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
    203204    ${PATH_OUT}/product-generated.h=>product-generated.h \
    204205"

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

    r58408 r60584  
    2222#include "the-linux-kernel.h"
    2323#include "version-generated.h"
     24#include "revision-generated.h"
    2425#include "product-generated.h"
    2526#include <linux/ethtool.h>
    … …  
    8889MODULE_LICENSE("GPL");
    8990#ifdef MODULE_VERSION
    90 MODULE_VERSION(VBOX_VERSION_STRING " (" RT_XSTR(INTNETTRUNKIFPORT_VERSION) ")");
     91MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV) " (" RT_XSTR(INTNETTRUNKIFPORT_VERSION) ")");
    9192#endif
    9293

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp

    r57943 r60584  
    8080    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
    8181    ${PATH_OUT}/version-generated.h=>version-generated.h \
     82    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
    8283    ${PATH_OUT}/product-generated.h=>product-generated.h \
    8384"

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

    r58845 r60584  
    2424#include "the-linux-kernel.h"
    2525#include "version-generated.h"
     26#include "revision-generated.h"
    2627#include "product-generated.h"
    2728#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
    … …  
    207208MODULE_LICENSE("GPL");
    208209#ifdef MODULE_VERSION
    209 MODULE_VERSION(VBOX_VERSION_STRING " (" RT_XSTR(INTNETTRUNKIFPORT_VERSION) ")");
     210MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV) " (" RT_XSTR(INTNETTRUNKIFPORT_VERSION) ")");
    210211#endif
    211212

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt

    r57943 r60584  
    8181    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
    8282    ${PATH_OUT}/version-generated.h=>version-generated.h \
     83    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
    8384    ${PATH_OUT}/product-generated.h=>product-generated.h \
    8485"

  • trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c

    r58963 r60584  
    2222#include "the-linux-kernel.h"
    2323#include "version-generated.h"
     24#include "revision-generated.h"
    2425#include "product-generated.h"
    2526
    … …  
    7374MODULE_LICENSE("GPL");
    7475#ifdef MODULE_VERSION
    75 MODULE_VERSION(VBOX_VERSION_STRING);
     76MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV));
    7677#endif
    7778

  • trunk/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci

    r57943 r60584  
    7979    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
    8080    ${PATH_OUT}/version-generated.h=>version-generated.h \
     81    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
    8182    ${PATH_OUT}/product-generated.h=>product-generated.h \
    8283"
Note: See TracChangeset for help on using the changeset viewer.

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