linux-sunxi / sunxi-livesuite

All in one repo for the LiveSuit tool, to take some of the pain outof using this.
106 stars 62 forks source link

not completely integrated with DKMS #6

Open R-Chandra opened 7 years ago

R-Chandra commented 7 years ago

In the subdirectory awusb, there is a dkms.conf, but the Makefile only works for the currently running kernel (because it calls "uname -r"). Wish I knew how I might submit a suggested fix directly, but "git push" says I don't have permission. So, instead I offer this diff:

diff --recursive --unified sunxi-livesuite/awusb/Makefile sunxi-livesuite-local/awusb/Makefile
--- sunxi-livesuite/awusb/Makefile  2017-09-08 14:08:55.554315565 -0400
+++ sunxi-livesuite-local/awusb/Makefile    2017-09-08 14:10:10.699068437 -0400
@@ -1,5 +1,15 @@
 obj-m := awusb.o
+
+# The following works on DKMS *only* under the currently running
+# kernel.  While installing a new kernel, "uname -r" is not helpful.
+# If building manually, KERNELVERSION is not defined anywhere, this
+# is inherited from being called under DKMS.
+ifeq ($(KERNELVERSION),)
 KDIR := /lib/modules/$(shell uname -r)/build
+else
+KDIR := /lib/modules/$(KERNELVERSION)/build
+endif
+
 PWD := $(shell pwd)

 default:
@@ -7,4 +17,3 @@
 clean:
    $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
    rm -rf Module.markers module.order module.sysvers 
-