From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 22 Sep 2015 03:53:35 +0000 (+1000)
Subject: do_build: use an absolute path for O=
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=61dfd1cb7587d911df28c93425fe4004c998c541;p=next-scripts

do_build: use an absolute path for O=

for the benefit of the perf build
---

diff --git a/do_build b/do_build
index 0cb1251..84b225c 100755
--- a/do_build
+++ b/do_build
@@ -4,6 +4,8 @@
 
 set -e
 
+bparent=$(dirname "$build_dir")
+
 cmd="/bin/sh"
 [ "$build_host" ] &&
 	cmd="ssh root@$build_host unshare -n su $(id -u -n)"
@@ -17,14 +19,14 @@ $cmd <<-EOF
 
 	cd "$build_dir" || exit 1
 
-	export CCACHE_DIR="${build_dir%/*}/.ccache"
-	export TMPDIR="${build_dir%/*}/tmp"
+	export CCACHE_DIR="$bparent/.ccache"
+	export TMPDIR="$bparent/tmp"
 
 	git reset --hard next || exit 1
 	touch .scmversion || exit 1
 
 	echo Building: x86_64 allmodconfig
-	d=../x86_64_allmodconfig
+	d="$bparent/x86_64_allmodconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_x86=\$d.log
 	e=\$d.except
@@ -35,7 +37,7 @@ $cmd <<-EOF
 	/usr/bin/time cross -n -N -a x86_64 -c $gcc_version O=\$d -j$j_factor -s > \$log_x86 2>&1 &
 
 	echo Building: powerpc ppc64_defconfig
-	d=../powerpc_ppc64_defconfig
+	d="$bparent/powerpc_ppc64_defconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_ppc=\$d.log
 	cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d ppc64_defconfig || exit 1
@@ -43,7 +45,7 @@ $cmd <<-EOF
 	/usr/bin/time cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d -j$j_factor -s > \$log_ppc 2>&1 &
 
 	echo Building: arm multi_v7_defconfig
-	d=../arm_multi_v7_defconfig
+	d="$bparent/arm_multi_v7_defconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_arm=\$d.log
 	cross -n -N -a arm -c $gcc_version O=\$d multi_v7_defconfig || exit 1
@@ -51,7 +53,7 @@ $cmd <<-EOF
 	/usr/bin/time cross -n -N -a arm -c $gcc_version O=\$d -j$j_factor -s > \$log_arm 2>&1 &
 
 	echo Building: perf
-	d=../perf
+	d="$bparent/perf"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_perf=\$d.log
 	echo "Forking perf build ..."