refactor: Package DRV_NAME changed to KMOD_NAME to avoid confusions.

epics-modules · Feb 19, 2024 · 211a4bd · 211a4bd
1 parent 0255016
commit 211a4bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/mrmShared/linux/CONFIG b/mrmShared/linux/CONFIG
@@ -3,6 +3,8 @@
 DRV_VERSION := 3
 
 # Package control vars
-PKG_NAME := mrf-dkms #PKG_NAME follows the drv name
-DRV_NAME := mrf # DRV_NAME has to be set as mrf due to hardcoded dependencies
+## PKG_NAME follows the drv name
+PKG_NAME := mrf-dkms
+## KMOD_NAME has to be set as mrf due to hardcoded dependencies
+KMOD_NAME := mrf
 DRV_GROUP := mrf
diff --git a/mrmShared/linux/dkms-rpm/Makefile b/mrmShared/linux/dkms-rpm/Makefile
@@ -28,7 +28,7 @@ clean:
 
 SED_SUBSTS =
 SED_SUBSTS += s/@@DRV_VERSION@@/$(DRV_VERSION)/g;
-SED_SUBSTS += s/@@DRV_NAME@@/$(DRV_NAME)/g;
+SED_SUBSTS += s/@@KMOD_NAME@@/$(KMOD_NAME)/g;
 SED_SUBSTS += s/@@RPM_VERSION@@/$(RPM_VERSION)/g;
 SED_SUBSTS += s/@@DRV_GROUP@@/$(DRV_GROUP)/g;
 SED_SUBSTS += s/@@RPM_RELEASE@@/$(RPM_RELEASE)/g;

diff --git a/mrmShared/linux/dkms-rpm/dkms.conf.in b/mrmShared/linux/dkms-rpm/dkms.conf.in
@@ -1,7 +1,7 @@
 DESCRIPTION="DKMS mrfioc2 kernel module."
-PACKAGE_NAME="@@DRV_NAME@@"
+PACKAGE_NAME="@@KMOD_NAME@@"
 PACKAGE_VERSION="@@RPM_VERSION@@"
-BUILT_MODULE_NAME[0]="@@DRV_NAME@@"
+BUILT_MODULE_NAME[0]="@@KMOD_NAME@@"
 DEST_MODULE_LOCATION[0]="/extra"
 MAKE[0]="make -j1 KERNEL_DIR=$kernel_source_dir VERSION=@@DRV_VERSION@@ DRV_VERSION=@@DRV_VERSION@@"
 AUTOINSTALL=YES

diff --git a/mrmShared/linux/dkms-rpm/mrf.spec.in b/mrmShared/linux/dkms-rpm/mrf.spec.in
@@ -1,4 +1,4 @@
-%define kmod_name @@DRV_NAME@@
+%define kmod_name @@KMOD_NAME@@
 %define udev_rules_update \
   /sbin/udevadm control --reload-rules && \
   /sbin/udevadm trigger