From 4db30027a96e5cf38ec8edd74947f02c96a10dc1 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Fri, 14 Jun 2019 18:54:15 -0400
Subject: [PATCH] Respect KERNEL_DIR environment variable

KERNEL_DIR environment variable can be used to configure
and make CAS with custom kernel source path.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 configure.d/Makefile       | 4 ++--
 configure.d/conf_framework | 5 +++--
 modules/Makefile           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.d/Makefile b/configure.d/Makefile
index 01ab388..21b221a 100644
--- a/configure.d/Makefile
+++ b/configure.d/Makefile
@@ -9,6 +9,6 @@ obj-m += test_mod.o
 MAKE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 all:
-	make -C /lib/modules/$(shell uname -r)/build M=$(MAKE_DIR) modules
+	make -C $(KERNEL_DIR) M=$(MAKE_DIR) modules
 clean:
-	make -C /lib/modules/$(shell uname -r)/build M=$(MAKE_DIR) clean
+	make -C $(KERNEL_DIR) M=$(MAKE_DIR) clean
diff --git a/configure.d/conf_framework b/configure.d/conf_framework
index 18e25c2..48b29e3 100644
--- a/configure.d/conf_framework
+++ b/configure.d/conf_framework
@@ -8,7 +8,8 @@ SCRIPTPATH=`dirname $0`
 SCRIPTPATH=`realpath $SCRIPTPATH`
 MODULE_FILE=$SCRIPTPATH/test_mod.c
 OBJ_MOD=$SCRIPTPATH/test_mod.o
-KERN_VER=`uname -r`
+KERNEL_DIR="${KERNEL_DIR:-/lib/modules/$(uname -r)/build/}"
+KERNEL_VER="$(cd $KERNEL_DIR; make kernelversion)"
 NPROC=`nproc`
 DEFINE_FILE=$SCRIPTPATH/../modules/generated_defines.h
 
@@ -43,7 +44,7 @@ compile_module(){
 	EOF
 	#######################################
 
-	make -C $SCRIPTPATH &> /dev/null
+	make -C $SCRIPTPATH KERNEL_DIR=${KERNEL_DIR} &> /dev/null
 
 	local ret=$?
 	if [ $ret -eq 0 ]; then
diff --git a/modules/Makefile b/modules/Makefile
index c32d182..1e86841 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -20,7 +20,7 @@ VERSION_FILE=$(PWD)/CAS_VERSION
 OCFDIR=$(PWD)/../ocf
 KERNEL_DIR ?= "/lib/modules/$(shell uname -r)/build"
 PWD=$(shell pwd)
-KERNEL_VERSION := $(shell uname -r)
+KERNEL_VERSION := $(cd $KERNEL_DIR; make kernelversion)
 MODULES_DIR=/lib/modules/$(KERNEL_VERSION)/extra
 
 DISK_MODULE = cas_disk