From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Sun, 2 Nov 2014 18:42:36 +0000 (+0200)
Subject: ofed_scripts: Set correct kernel source/obj directory
X-Git-Tag: vofed-3.18~92
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=55424f984d8c4d941bf37d855845f6889b880a8a;p=~tnikolova%2Fcompat-rdma%2F.git

ofed_scripts: Set correct kernel source/obj directory

This is relevant for SLES Distros

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/configure b/configure
index a109517..9079de4 100755
--- a/configure
+++ b/configure
@@ -39,7 +39,9 @@ Usage:  `basename $0` [options]
     --build_root=BUILD_ROOT  root directory to build RPM packages
     --kernel-version=VERSION  make for this kernel [$(uname -r)]
     --modules-dir=DIR  modules directory [/lib/modules/$(uname -r)]
-    --kernel-sources=DIR  make for this kernel [/lib/modules/$(uname -r)/build]
+    --kernel-sources=DIR  make for this kernel [/lib/modules/$(uname -r)/source]
+    --with-linux=DIR  kernel sources directory [/lib/modules/$(uname -r)/source]
+    --with-linux-obj=DIR  kernel obj directory [/lib/modules/$(uname -r)/build]
 
     Kernel modules configuration:
 
@@ -233,7 +235,7 @@ check_kerver()
 
 function check_autofconf {
 	VAR=$1
-	VALUE=$(tac ${KSRC}/include/*/autoconf.h | grep -m1 ${VAR} | sed -ne 's/.*\([01]\)$/\1/gp')
+	VALUE=$(tac ${KSRC_OBJ}/include/*/autoconf.h | grep -m1 ${VAR} | sed -ne 's/.*\([01]\)$/\1/gp')
 
 	eval "export $VAR=$VALUE"
 }
@@ -278,6 +280,14 @@ main()
                         -kernel-sources=* | --kernel-sources=* | --kernel-src=* | --kern-src=* | --ker-src=*)
                                 KSRC=`expr "x$1" : 'x[^=]*=\(.*\)'`
                         ;;
+                        --with-linux)
+                                shift
+                                KSRC=$1
+                        ;;
+                        --with-linux-obj)
+                                shift
+                                KSRC_OBJ=$1
+                        ;;
                         -with-quilt | --with-quilt)
                                 ofed_patch_params="$ofed_patch_params $1"
                                 if [ ! -z "$2" ] && [ "`echo -n $2 | cut -c 1`" != '-' ]; then
@@ -671,7 +681,8 @@ main()
 KVERSION=${KVERSION:-$(uname -r)}
 MIN_KVERSION="2.6.5"
 MODULES_DIR=${MODULES_DIR:-/lib/modules/${KVERSION}/updates}
-KSRC=${KSRC:-/lib/modules/${KVERSION}/build}
+KSRC=${KSRC:-/lib/modules/${KVERSION}/source}
+KSRC_OBJ=${KSRC_OBJ:-/lib/modules/$KVERSION/build}
 
 ARCH=${ARCH:-$(uname -m)}
 
@@ -822,7 +833,8 @@ KVERSION=${KVERSION}
 ARCH=${ARCH}
 MODULES_DIR=${MODULES_DIR}
 KSRC=${KSRC}
-KLIB_BUILD=${KSRC}
+KSRC_OBJ=${KSRC_OBJ}
+KLIB_BUILD=${KSRC_OBJ}
 
 AUTOCONF_H=${AUTOCONF_H}
 
@@ -1511,7 +1523,7 @@ EOFAUTOCONF
 
         cd compat
         ex ./autogen.sh
-        ex ./configure --with-linux-obj=$KSRC --with-linux=$KSRC
+        ex ./configure --with-linux-obj=$KSRC_OBJ --with-linux=$KSRC
 }
 
 main $@
diff --git a/makefile b/makefile
index e9c13ab..47fb6e0 100644
--- a/makefile
+++ b/makefile
@@ -51,7 +51,7 @@ all: kernel
 install: install_kernel
 install_kernel: install_modules
 
-autoconf_h=$(shell /bin/ls -1 $(KSRC)/include/*/autoconf.h 2> /dev/null | head -1)
+autoconf_h=$(shell /bin/ls -1 $(KSRC_OBJ)/include/*/autoconf.h 2> /dev/null | head -1)
 kconfig_h=$(shell /bin/ls -1 $(KSRC)/include/*/kconfig.h 2> /dev/null | head -1)
 
 ifneq ($(kconfig_h),)
@@ -70,9 +70,9 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
 	@echo "Building kernel modules"
 	@echo "Kernel version: $(KVERSION)"
 	@echo "Modules directory: $(INSTALL_MOD_PATH)/$(MODULES_DIR)"
-	@echo "Kernel sources: $(KSRC)"
+	@echo "Kernel sources: $(KSRC_OBJ)"
 	env CWD=$(CWD) BACKPORT_INCLUDES=$(BACKPORT_INCLUDES) \
-		$(MAKE) -C $(KSRC) SUBDIRS="$(CWD)" \
+		$(MAKE) -C $(KSRC_OBJ) SUBDIRS="$(CWD)" \
 		V=$(V) KBUILD_NOCMDDEP=1 $(WITH_MAKE_PARAMS) \
 		CONFIG_MEMTRACK=$(CONFIG_MEMTRACK) \
 		CONFIG_DEBUG_INFO=$(CONFIG_DEBUG_INFO) \
@@ -177,7 +177,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
 install_modules:
 	@echo "Installing kernel modules"
 
-	$(MAKE) -C $(KSRC) SUBDIRS="$(CWD)" \
+	$(MAKE) -C $(KSRC_OBJ) SUBDIRS="$(CWD)" \
 		INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) \
 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
 		$(WITH_MAKE_PARAMS) modules_install;
@@ -186,7 +186,7 @@ install_modules:
 clean: clean_kernel
 
 clean_kernel:
-	$(MAKE) -C $(KSRC) SUBDIRS="$(CWD)" $(WITH_MAKE_PARAMS) clean
+	$(MAKE) -C $(KSRC_OBJ) SUBDIRS="$(CWD)" $(WITH_MAKE_PARAMS) clean
 	@/bin/rm -f $(clean-files)
 
 clean-files := Module.symvers modules.order Module.markers compat/modules.order