kbuild: Add variables for kernel root and kernel output directories

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/kbuild.sh b/kbuild.sh
index 98f3a0a..9eeaa56 100755
--- a/kbuild.sh
+++ b/kbuild.sh
@@ -4,6 +4,8 @@
 set -e
 
 kbuild_root=$(dirname $(readlink -f "$0"))
+kernel_root="${PWD}"
+kernel_output="${kernel_root}/output"
 
 declare -A cross_compile
 declare -A extra_kcflags
@@ -154,7 +156,7 @@ if [[ -z "$platform" || "$platform" == "auto" ]] ; then
 		pattern=$(cat $f | grep "dir_pattern=" | head -1)
 		pattern=${pattern/#dir_pattern=/}
 		if [[ -n "$pattern" ]] ; then
-			echo $PWD | grep -q "$pattern" || continue
+			echo "$kernel_root" | grep -q "$pattern" || continue
 			platform=$(basename -s .sh $f)
 			break
 		fi
@@ -192,10 +194,10 @@ source "${kbuild_root}/arch/$arch.sh" || exit 1
 # Override the output directory for ARM for historical reasons
 case $arch in
 	arm)
-		output_dir=$PWD/output/arm32
+		output_dir="$kernel_output/arm32"
 		;;
 	*)
-		output_dir=$PWD/output/$arch
+		output_dir="$kernel_output/$arch"
 		;;
 esac
 
@@ -229,12 +231,12 @@ fi
 
 if [[ ${do_build[doc]} == 1 ]] ; then
 	(
-	if [[ ! -f $PWD/output/doc/bin/activate ]] ; then
-		virtualenv $PWD/output/doc
-		source $PWD/output/doc/bin/activate
+	if [[ ! -f "$kernel_output/doc/bin/activate" ]] ; then
+		virtualenv "$kernel_output/doc"
+		source "$kernel_output/doc/bin/activate"
 		pip install -r Documentation/sphinx/requirements.txt
 	else
-		source $PWD/output/doc/bin/activate
+		source "$kernel_output/doc/bin/activate"
 	fi
 
 	$pmake SPHINXDIRS="${opt_doc_dirs}" htmldocs