diff options
| author | Dmitriy Eshenko <dmitriy.eshenko@accel-ppp.org> | 2024-04-02 14:26:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 14:26:24 +0300 |
| commit | 3668336266cb74b6d37e5b56c9c5b74761a868fc (patch) | |
| tree | fec8f523f76aace6339df53b58951265ad7ffac6 /drivers | |
| parent | 6afbc5075a3cf88a47f01c9051dd0a7fdcb06299 (diff) | |
| parent | 6de7ff916bca3ef97eefca9e36cd8db45c2a0c7e (diff) | |
| download | accel-ppp-3668336266cb74b6d37e5b56c9c5b74761a868fc.tar.gz accel-ppp-3668336266cb74b6d37e5b56c9c5b74761a868fc.zip | |
Merge pull request #129 from nuclearcat/module-version-cmake
ipoe,vlan_mon: print module version generated from CMake
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ipoe/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | drivers/ipoe/ipoe.c | 3 | ||||
| -rw-r--r-- | drivers/vlan_mon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | drivers/vlan_mon/vlan_mon.c | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/drivers/ipoe/CMakeLists.txt b/drivers/ipoe/CMakeLists.txt index 6f4f043a..e221a7ec 100644 --- a/drivers/ipoe/CMakeLists.txt +++ b/drivers/ipoe/CMakeLists.txt @@ -1,3 +1,4 @@ + if (NOT DEFINED KDIR) set(KDIR "/usr/src/linux") endif (NOT DEFINED KDIR) @@ -6,6 +7,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/driver/ipoe.ko COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/driver COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/driver COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_BINARY_DIR}/driver + COMMAND ln -sf ${CMAKE_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/driver COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/driver modules DEPENDS ipoe.c ipoe.h ) diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index 2008e08b..fa7dec3f 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -33,6 +33,7 @@ #include <net/ip6_route.h> #include "ipoe.h" +#include "version.h" #define BEGIN_UPDATE 1 #define UPDATE 2 @@ -1909,7 +1910,7 @@ static int __init ipoe_init(void) { int err, i; - printk("IPoE session driver v1.11\n"); + printk("IPoE session driver v%s\n", ACCEL_PPP_VERSION); /*err = register_pernet_device(&ipoe_net_ops); if (err < 0) diff --git a/drivers/vlan_mon/CMakeLists.txt b/drivers/vlan_mon/CMakeLists.txt index 1d0c3c88..b4c8e348 100644 --- a/drivers/vlan_mon/CMakeLists.txt +++ b/drivers/vlan_mon/CMakeLists.txt @@ -6,6 +6,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/driver/vlan_mon.ko COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/driver COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/driver COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_BINARY_DIR}/driver + COMMAND ln -sf ${CMAKE_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/driver COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/driver modules DEPENDS vlan_mon.c vlan_mon.h ) diff --git a/drivers/vlan_mon/vlan_mon.c b/drivers/vlan_mon/vlan_mon.c index e37fd365..d5f42c91 100644 --- a/drivers/vlan_mon/vlan_mon.c +++ b/drivers/vlan_mon/vlan_mon.c @@ -18,6 +18,7 @@ #include <net/netns/generic.h> #include "vlan_mon.h" +#include "version.h" #define VLAN_MON_MAGIC 0x639fa78c @@ -728,7 +729,7 @@ static int __init vlan_mon_init(void) int i; #endif - printk("vlan-mon driver v1.11\n"); + printk("vlan-mon driver v%s\n", ACCEL_PPP_VERSION); INIT_WORK(&vlan_notify_work, vlan_do_notify); |