Skip to content

Commit

Permalink
refactor: Package DRV_NAME changed to KMOD_NAME to avoid confusions.
Browse files Browse the repository at this point in the history
  • Loading branch information
jerzyjamroz committed Feb 20, 2024
1 parent 0255016 commit 12c8fc0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
8 changes: 5 additions & 3 deletions mrmShared/linux/CONFIG
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Version definition for driver
# 20240124 Release
DRV_VERSION := 3
DRV_GROUP := mrf

# 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
DRV_GROUP := mrf
## PKG_NAME follows the kmod name
PKG_NAME := mrf-dkms
## KMOD_NAME has to be set as mrf due to hardcoded dependencies
KMOD_NAME := mrf
2 changes: 1 addition & 1 deletion mrmShared/linux/dkms-rpm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions mrmShared/linux/dkms-rpm/dkms.conf.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion mrmShared/linux/dkms-rpm/mrf.spec.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -71,6 +71,7 @@ rmdir /usr/src/%{kmod_name}-%{version}

* Wed Jan 24 2024 Jerzy Jamroz <[email protected]> - 3-1
- Build adjustments exposing the control variables.
- Pkg name changed from mrf to mrf-dkms.
- Correction of the driver version handling.
- Group rw access for the pci resource0.
- AER handling functions.
Expand Down

0 comments on commit 12c8fc0

Please sign in to comment.