github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39 from arutk/config_custom_kernel

Browse Source 
Respect KERNEL_DIR environment variable
This commit is contained in:
Michał Mielewczyk 2019-06-21 13:23:19 +02:00 committed by GitHub
commit f786f8419a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.d/Makefile
View File

@ -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

5
configure.d/conf_framework
View File

@ -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

2
modules/Makefile
View File

@ -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