From: Keir Fraser Date: Thu, 12 Jun 2008 17:28:35 +0000 (+0100) Subject: When building from a tarball release use hardcoded path to X-Git-Tag: 3.2.2-rc1~27 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=351dd2187ae28c7400a16cf7c01d3d549848fa8f;p=people%2Fvhanquez%2Fxen.git When building from a tarball release use hardcoded path to linux-2.6.18-xen.hg as a last resort when searching for a Linux source tree. Signed-off-by: Ian Campbell xen-unstable changeset: 17802:f6520678755ab9690251467e1945cda63b040572 xen-unstable date: Mon Jun 09 10:44:09 2008 +0100 --- diff --git a/buildconfigs/select-repository b/buildconfigs/select-repository index d32db069f..e5bf27e47 100755 --- a/buildconfigs/select-repository +++ b/buildconfigs/select-repository @@ -32,31 +32,38 @@ if [ X"${LINUX_SRC_PATH}" != X ] ; then IFS="$IFS_saved" fi -XEN=$(hg -R ${XEN_ROOT} path default) -if [ $? -ne 0 ] || [ X"$XEN" = "X" ] ; then - echo "$ME: Unable to determine Xen repository parent." 1>&2 - exit 1; -fi +if [ -d ${XEN_ROOT}/.hgxxx ] ; then + XEN=$(hg -R ${XEN_ROOT} path default) + if [ $? -ne 0 ] || [ X"$XEN" = "X" ] ; then + echo "$ME: Unable to determine Xen repository parent." 1>&2 + exit 1; + fi -BASE=$(dirname ${XEN}) -if [ $? -ne 0 ] || [ X"$BASE" = "X" ] ; then - echo "$ME: Unable to determine Xen repository base." 1>&2 - exit 1; -fi -if [ -d "$XEN" ] && [ ! -d "$BASE/$REPO" ] ; then - echo "$ME: No such dir: $BASE/$REPO" 1>&2 - exit 1 -fi + BASE=$(dirname ${XEN}) + if [ $? -ne 0 ] || [ X"$BASE" = "X" ] ; then + echo "$ME: Unable to determine Xen repository base." 1>&2 + exit 1; + fi + if [ -d "$XEN" ] && [ ! -d "$BASE/$REPO" ] ; then + echo "$ME: No such dir: $BASE/$REPO" 1>&2 + exit 1 + fi -echo "$ME: Found ${BASE}/${REPO}" 1>&2 + echo "$ME: Found ${BASE}/${REPO}" 1>&2 -# If ${BASE}/${REPO} is a local directory then prepend file:// so that -# the test in src.hg-clone will fail and we will clone instead of -# linking this repository. We only want to link repositories which -# were found via LINUX_SRC_PATH. -if [ -d "${BASE}/${REPO}" ] ; then - echo "file://${BASE}/${REPO}" + # If ${BASE}/${REPO} is a local directory then prepend file:// so that + # the test in src.hg-clone will fail and we will clone instead of + # linking this repository. We only want to link repositories which + # were found via LINUX_SRC_PATH. + if [ -d "${BASE}/${REPO}" ] ; then + echo "file://${BASE}/${REPO}" + else + echo ${BASE}/${REPO} + fi else - echo ${BASE}/${REPO} + echo "Unable to determine path to Linux source tree." 1>&2 + echo "Falling back to linux-2.6.18-xen Mercurial repository." 1>&2 + echo http://xenbits.xensource.com/linux-2.6.18-xen.hg fi + exit 0