Merge pull request #202 from krichter722/makefile

made automatic retrieval of kernel version more flexible and allowing…
facebookarchive · Aug 30, 2017 · 437afbf · 437afbf
2 parents 722455c + 4754b66
commit 437afbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 COMMIT_REV := $(shell git describe  --always --abbrev=12)
-KERNEL_TREE ?= /lib/modules/$(shell uname -r)/build
+KERNEL_VERSION ?= $(shell uname -r)
+KERNEL_TREE ?= /lib/modules/$(KERNEL_VERSION)/build
 export COMMIT_REV
 
 # Check for RHEL/CentOS

diff --git a/Makefile.dkms b/Makefile.dkms
@@ -30,7 +30,7 @@ boot_conf: utils
 	if test -d /etc/initramfs-tools/hooks; then \
 		install -o root -g root src/flashcache.hook /etc/initramfs-tools/hooks/flashcache ; \
 		install -o root -g root src/utils/flashcache_scan /etc/initramfs-tools/scripts/init-premount/ ; \
-		update-initramfs -k $(shell uname -r) -u ; \
+		update-initramfs -k $(KERNEL_VERSION) -u ; \
 	fi
 
 .PHONY: utils