From: Antti Kantee <pooka@iki.fi>
Date: Tue, 26 Jan 2016 20:51:47 +0000 (+0000)
Subject: Run the xen probe in a subshell.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a0d5df217dbbf99866cdf6f9df4d6e26510d50ec;p=osstest%2Frumprun.git

Run the xen probe in a subshell.

Might fix Travis build failure.  Who knows.  Hard to say for
sure about the problems which I can't repeat locally.
---

diff --git a/build-rr.sh b/build-rr.sh
index 6d19448..4054430 100755
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -211,7 +211,8 @@ checksubmodules ()
 probeprereqs ()
 {
 
-	if [ "${PLATFORM}" = "xen" ]; then
+	if [ "${PLATFORM}" = "xen" ]; then (
+		. "${RROBJ}/config.sh"
 		# probe location of Xen headers
 		found=false
 		for loc in /usr/pkg/include/xen /usr/include/xen; do
@@ -231,7 +232,7 @@ probeprereqs ()
 			echo '>> The exactly source depends on your system'
 			echo '>> (e.g. libxen-dev package on some systems)'
 			die Xen headers not found
-		fi
+		fi )
 	fi
 }
 
@@ -325,8 +326,6 @@ export RUMPRUN_SHCONF="${RROBJ}/config.sh"
 EOF
 	export RUMPRUN_MKCONF="${RROBJ}/config.mk"
 
-	. "${RROBJ}/config.sh"
-
 	probeprereqs
 
 	cat >> ${RUMPTOOLS}/mk.conf << EOF