From aa71bfd93b53a361a0fb8bc4b2f252eba4ad9fdf Mon Sep 17 00:00:00 2001 From: WeebDataHoarder <57538841+weebdatahoarder@users.noreply.github.com> Date: Mon, 25 Oct 2021 20:09:44 +0200 Subject: [PATCH] Added DKMS build support --- dkms.conf | 9 +++++++++ src/Makefile | 6 +++--- src/common.mk | 1 + src/fm10k_main.c | 6 +++--- src/version.h | 3 +++ 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 dkms.conf create mode 100644 src/version.h diff --git a/dkms.conf b/dkms.conf new file mode 100644 index 0000000..65f67a5 --- /dev/null +++ b/dkms.conf @@ -0,0 +1,9 @@ +MAKE="make -C src/ BUILD_KERNEL=${kernelver} KSRC=${kernel_source_dir} CONFIG_UIO=1" +CLEAN="make -C src/ clean" +BUILT_MODULE_NAME=fm10k +BUILT_MODULE_LOCATION=src/ +PACKAGE_NAME=fm10k +PACKAGE_VERSION=0.27.1-gs-patched +DEST_MODULE_NAME=fm10k +DEST_MODULE_LOCATION=/updates/drivers/net/ethernet/intel +AUTOINSTALL=yes \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index a0359b8..caf9be4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright(c) 2013 - 2019 Intel Corporation. -ifneq ($(KERNELRELEASE),) +ifneq ($(DO_ACTUAL_BUILD),) # kbuild part of makefile # # Makefile for the Intel(R) Ethernet Switch Host Interface Driver @@ -29,7 +29,7 @@ fm10k-y += fm10k_uio.o endif fm10k-y += kcompat.o -else # ifneq($(KERNELRELEASE),) +else # ifneq($(DO_ACTUAL_BUILD),) # normal makefile DRIVER := fm10k @@ -170,4 +170,4 @@ help: .PHONY: default noisy clean manfile silent sparse ccc install uninstall help -endif # ifneq($(KERNELRELEASE),) +endif # ifneq($(DO_ACTUAL_BUILD),) diff --git a/src/common.mk b/src/common.mk index 5455e89..e83d6af 100644 --- a/src/common.mk +++ b/src/common.mk @@ -300,5 +300,6 @@ kernelbuild = ${MAKE} $(if ${GCC_I_SYS},CC="${GCC_I_SYS}") \ ${CCFLAGS_VAR}="${EXTRA_CFLAGS}" \ -C "${KSRC}" \ CONFIG_${DRIVER_UPPERCASE}=m \ + DO_ACTUAL_BUILD=y \ M="${CURDIR}" \ ${2} ${1} diff --git a/src/fm10k_main.c b/src/fm10k_main.c index edb1437..234c4a3 100644 --- a/src/fm10k_main.c +++ b/src/fm10k_main.c @@ -13,10 +13,10 @@ #include "fm10k.h" -#define DRV_VERSION "0.27.1-gs-patched" -#define DRV_SUMMARY "Intel(R) Ethernet Switch Host Interface Driver" +#include "version.h" + const char fm10k_driver_version[] = DRV_VERSION; -char fm10k_driver_name[] = "fm10k"; +char fm10k_driver_name[] = DRV_NAME; static const char fm10k_driver_string[] = DRV_SUMMARY; static const char fm10k_copyright[] = "Copyright(c) 2013 - 2019 Intel Corporation."; diff --git a/src/version.h b/src/version.h new file mode 100644 index 0000000..35e6efb --- /dev/null +++ b/src/version.h @@ -0,0 +1,3 @@ +#define DRV_NAME "fm10k" +#define DRV_VERSION "0.27.1-gs-patched" +#define DRV_SUMMARY "Intel(R) Ethernet Switch Host Interface Driver" \ No newline at end of file