Revert "Makefile: don't install the file as is for DKMS"

This reverts commit ebbe59b205.

It caused difficulties with packaging the module which require relevant
knowledge to resolve.  So far it seems simpler to revert this
modification.
This commit is contained in:
xaizek
2025-06-18 20:43:11 +03:00
parent 7df2680746
commit e315b9db4a
2 changed files with 5 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
makefile := obj-m += nct6687.o
obj-m += nct6687.o
curpwd := $(shell pwd)
kver ?= $(shell uname -r)
@@ -10,8 +10,7 @@ fedoraver := $(shell sed -n 's/.*Fedora release \([^ ]*\).*/\1/p' /etc/fedora-
build:
rm -rf ${curpwd}/${kver}
mkdir -p ${curpwd}/${kver}
cp ${curpwd}/nct6687.c ${curpwd}/${kver}
echo '${makefile}' > ${curpwd}/${kver}/Makefile
cp ${curpwd}/Makefile ${curpwd}/nct6687.c ${curpwd}/${kver}
cd ${curpwd}/${kver}
make -C /lib/modules/${kver}/build M=${curpwd}/${kver} modules
install: build
@@ -31,8 +30,7 @@ akmod/build:
fi
sudo dnf install -y rpmdevtools kmodtool
mkdir -p ${curpwd}/.tmp/nct6687d-1.0.${commitcount}/nct6687d
cp LICENSE nct6687.c ${curpwd}/.tmp/nct6687d-1.0.${commitcount}/nct6687d
echo '${makefile}' > ${curpwd}/.tmp/nct6687d-1.0.${commitcount}/nct6687d/Makefile
cp LICENSE Makefile nct6687.c ${curpwd}/.tmp/nct6687d-1.0.${commitcount}/nct6687d
cd .tmp && tar -czvf nct6687d-1.0.${commitcount}.tar.gz nct6687d-1.0.${commitcount} && cd -
mkdir -p ${curpwd}/.tmp/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
cp ${curpwd}/.tmp/nct6687d-1.0.${commitcount}.tar.gz ${curpwd}/.tmp/rpmbuild/SOURCES/
@@ -56,8 +54,7 @@ dkms/build:
dkms/install:
rm -rf ${curpwd}/dkms
mkdir -p ${curpwd}/dkms
cp ${curpwd}/dkms.conf ${curpwd}/nct6687.c ${curpwd}/dkms
echo '${makefile}' > ${curpwd}/dkms/Makefile
cp ${curpwd}/dkms.conf ${curpwd}/Makefile ${curpwd}/nct6687.c ${curpwd}/dkms
sudo rm -rf /usr/src/nct6687d-1
sudo cp -rT dkms /usr/src/nct6687d-1
sudo dkms install nct6687d/1

View File

@@ -1,5 +1,6 @@
PACKAGE_NAME="nct6687d"
PACKAGE_VERSION="1"
MAKE[0]="make kver=${kernelver} dkms/build"
BUILT_MODULE_NAME[0]="nct6687"
DEST_MODULE_LOCATION[0]="/kernel/drivers/hwmon/"
AUTOINSTALL="yes"