diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt index 7689bb19a2..46649a1dc7 100644 --- a/driver/CMakeLists.txt +++ b/driver/CMakeLists.txt @@ -124,7 +124,7 @@ if(ENABLE_DKMS) ${CMAKE_CURRENT_BINARY_DIR}/src/dkms.conf ${CMAKE_CURRENT_BINARY_DIR}/src/driver_config.h ${DRIVER_SOURCES} - DESTINATION "src/${DRIVER_PACKAGE_NAME}-${PROBE_VERSION}" + DESTINATION "src/${DRIVER_PACKAGE_NAME}-${DRIVER_VERSION}" COMPONENT ${DRIVER_COMPONENT_NAME}) endif() diff --git a/driver/bpf/CMakeLists.txt b/driver/bpf/CMakeLists.txt index cf19f50374..fab7a73e52 100644 --- a/driver/bpf/CMakeLists.txt +++ b/driver/bpf/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 The Falco Authors. +# Copyright (C) 2022 The Falco Authors. # # This file is dual licensed under either the MIT or GPL 2. See # MIT.txt or GPL.txt for full copies of the license. @@ -29,5 +29,5 @@ install(FILES quirks.h ring_helpers.h types.h - DESTINATION "src/${DRIVER_PACKAGE_NAME}-${PROBE_VERSION}/bpf" + DESTINATION "src/${DRIVER_PACKAGE_NAME}-${DRIVER_VERSION}/bpf" COMPONENT ${DRIVER_COMPONENT_NAME}) diff --git a/driver/bpf/probe.c b/driver/bpf/probe.c index 722dba8f8d..428e905e4f 100644 --- a/driver/bpf/probe.c +++ b/driver/bpf/probe.c @@ -251,7 +251,7 @@ char kernel_ver[] __bpf_section("kernel_version") = UTS_RELEASE; char __license[] __bpf_section("license") = "GPL"; -char probe_ver[] __bpf_section("probe_version") = PROBE_VERSION; +char probe_ver[] __bpf_section("probe_version") = DRIVER_VERSION; char probe_commit[] __bpf_section("build_commit") = PROBE_COMMIT; diff --git a/driver/dkms.conf.in b/driver/dkms.conf.in index 9f1e3d8eef..1d97810c64 100644 --- a/driver/dkms.conf.in +++ b/driver/dkms.conf.in @@ -1,5 +1,5 @@ PACKAGE_NAME="@DRIVER_PACKAGE_NAME@" -PACKAGE_VERSION="@PROBE_VERSION@" +PACKAGE_VERSION="@DRIVER_VERSION@" BUILT_MODULE_NAME[0]="@DRIVER_NAME@" DEST_MODULE_LOCATION[0]="/kernel/extra" AUTOINSTALL="yes" diff --git a/driver/driver_config.h.in b/driver/driver_config.h.in index e6778a7645..2088039717 100644 --- a/driver/driver_config.h.in +++ b/driver/driver_config.h.in @@ -20,7 +20,7 @@ or GPL2.txt for full copies of the license. #include "ppm_api_version.h" -#define PROBE_VERSION "${PROBE_VERSION}" +#define DRIVER_VERSION "${DRIVER_VERSION}" #define DRIVER_NAME "${DRIVER_NAME}" diff --git a/driver/main.c b/driver/main.c index 1eab27b591..90d1067815 100644 --- a/driver/main.c +++ b/driver/main.c @@ -776,7 +776,7 @@ static long ppm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ret = 0; goto cleanup_ioctl_nolock; } else if (cmd == PPM_IOCTL_GET_PROBE_VERSION) { - if (copy_to_user((void *)arg, PROBE_VERSION, sizeof(PROBE_VERSION))) { + if (copy_to_user((void *)arg, DRIVER_VERSION, sizeof(DRIVER_VERSION))) { ret = -EINVAL; goto cleanup_ioctl_nolock; } @@ -2458,7 +2458,7 @@ int scap_init(void) #else struct class_device *device = NULL; #endif - pr_info("driver loading, " DRIVER_NAME " " PROBE_VERSION "\n"); + pr_info("driver loading, " DRIVER_NAME " " DRIVER_VERSION "\n"); ret = get_tracepoint_handles(); if (ret < 0) @@ -2637,7 +2637,7 @@ void scap_exit(void) module_init(scap_init); module_exit(scap_exit); -MODULE_VERSION(PROBE_VERSION); +MODULE_VERSION(DRIVER_VERSION); MODULE_INFO(build_commit, PROBE_COMMIT); MODULE_INFO(api_version, PPM_API_CURRENT_VERSION_STRING); MODULE_INFO(schema_version, PPM_SCHEMA_CURRENT_VERSION_STRING); diff --git a/userspace/libscap/CMakeLists.txt b/userspace/libscap/CMakeLists.txt index 232da23524..1bc670ea18 100644 --- a/userspace/libscap/CMakeLists.txt +++ b/userspace/libscap/CMakeLists.txt @@ -30,8 +30,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") set(KBUILD_FLAGS "${FALCOSECURITY_LIBS_DEBUG_FLAGS}") endif() - if(NOT DEFINED PROBE_VERSION) - set(PROBE_VERSION "${FALCOSECURITY_LIBS_VERSION}") + if(NOT DEFINED DRIVER_VERSION) + set(DRIVER_VERSION "${FALCOSECURITY_LIBS_VERSION}") endif() if(NOT DEFINED DRIVER_NAME)