refactor: Better handling of the mrf module variables.

jerzyjamroz · Nov 1, 2024 · 6acea8a · 6acea8a
1 parent 7ae6e3b
commit 6acea8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/mrmShared/linux/CONFIG_TARGET b/mrmShared/linux/CONFIG_TARGET
@@ -2,5 +2,5 @@
 OS_NAME := $(shell grep "^NAME=" /etc/os-release | cut -d'=' -f2)
 # List backported OSes that use VM_FLAGS_WRAPPER for kernels <= 6.3
 ifeq ($(OS_NAME), "CentOS Stream")
-CFLAGS_MODULE += -DUSE_VM_FLAGS_WRAPPER
+CFLAGS_TARGET += -DUSE_VM_FLAGS_WRAPPER
 endif
diff --git a/mrmShared/linux/Kbuild b/mrmShared/linux/Kbuild
@@ -1,4 +1,5 @@
-KBUILD_CPPFLAGS += -DDRV_VERSION='"$(DRV_VERSION)"'
+CFLAGS_MODULE += -DDRV_VERSION='"$(DRV_VERSION)"'
+CFLAGS_MODULE += $(CFLAGS_TARGET)
 
 obj-m := mrf.o
 

diff --git a/mrmShared/linux/Makefile b/mrmShared/linux/Makefile
@@ -3,9 +3,12 @@ KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 include CONFIG
 include CONFIG_TARGET
 
+MAKE += DRV_VERSION=$(DRV_VERSION)
+MAKE += CFLAGS_TARGET=$(CFLAGS_TARGET)
+
 all: modules
 
 modules modules_install clean:
-	$(MAKE) -C $(KERNELDIR) DRV_VERSION='$(DRV_VERSION)' M=$(CURDIR) CFLAGS_MODULE=$(CFLAGS_MODULE) $@
+	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) $@
 
 .PHONY: all modules modules_install clean
diff --git a/mrmShared/linux/dkms-rpm/Makefile.dkms.in b/mrmShared/linux/dkms-rpm/Makefile.dkms.in
@@ -5,4 +5,4 @@
 KERNEL_DIR ?= /lib/modules/$(kernelver)/build
 
 mrf.ko:
-	make -C $(KERNEL_DIR) M=$(CURDIR) CFLAGS_MODULE=$(CFLAGS_MODULE) modules
+	make -C $(KERNEL_DIR) M=$(CURDIR) CFLAGS_TARGET=$(CFLAGS_TARGET) modules