joachim/argon40-battery-display
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DKMS build using the wrong kernel version

Browse Source 
The DKMS Makefile built against /lib/modules/$(uname -r), the *running*
kernel. When DKMS rebuilds the module for a newly installed kernel (the
common case after an apt upgrade, while the old kernel is still running),
it produced a .ko with the old kernel's vermagic and installed it into
the new kernel's tree. The module then failed to load with "disagrees
about version of symbol module_layout".

Make the Makefile honour a KVERSION variable (defaulting to the running
kernel for manual builds) and have dkms.conf pass DKMS's target kernel
via KVERSION=${kernelver}, so the module is always built for the kernel
it is being installed for.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Joachim Hummel
2026-05-16 23:07:17 +02:00
parent 2e65dadfa9
commit 500a939db4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
battery/dkms/Makefile
View File

@@ -1,9 +1,14 @@
obj-m += oneUpPower.o obj-m += oneUpPower.o
# KVERSION is the kernel to build for. DKMS passes the *target* kernel via
# the MAKE directive in dkms.conf; default to the running kernel so a plain
# `make` still works for a manual build.
KVERSION ?= $(shell uname -r)
all: all:
make -C /lib/modules/$(shell uname -r)/build M=$(PWD)/src modules make -C /lib/modules/$(KVERSION)/build M=$(PWD)/src modules
clean: clean:
make -C /lib/modules/$(shell uname -r)/build M=$(PWD)/src clean make -C /lib/modules/$(KVERSION)/build M=$(PWD)/src clean
.PHONY: all clean .PHONY: all clean

5
battery/dkms/dkms.conf
View File

@@ -1,10 +1,9 @@
PACKAGE_NAME="oneUpPower" PACKAGE_NAME="oneUpPower"
PACKAGE_VERSION="1.0" PACKAGE_VERSION="1.0"
MAKE="make -f ./src/Makefile" MAKE="make -f ./src/Makefile KVERSION=${kernelver}"
CLEAN="make -f ./src/Makefile clean" CLEAN="make -f ./src/Makefile clean KVERSION=${kernelver}"
BUILT_MODULE_NAME="oneUpPower" BUILT_MODULE_NAME="oneUpPower"
BUILT_MODULE_LOCATION="./src/" BUILT_MODULE_LOCATION="./src/"
DEST_MODULE_LOCATION="/kernel/drivers/power/supply/" DEST_MODULE_LOCATION="/kernel/drivers/power/supply/"
AUTOINSTALL="yes" AUTOINSTALL="yes"
POST_INSTALL="./postinstall" POST_INSTALL="./postinstall"