summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-08-04 14:53:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-10 13:33:06 +0100
commitb0761479e46a99b3b96e20fd142881e2a0a63136 (patch)
treedbd17b62cbfc74da2a48d617479be3151a64cbc6 /scripts
parentcf3ed8231c4794a37aa33822ed1b193df5f4ab44 (diff)
downloadpoky-b0761479e46a99b3b96e20fd142881e2a0a63136.tar.gz
scripts/oe-buildenv-internal: improve the error detecting for $BDIR
The previous fix for a bug in Ubuntu 10.04 readlink, be2a2764d8ceb398d81714661e6f199c8b11946c, notified the user when a trailing slash was used. As there is no semantic difference, simply remove any trailing slashes and proceed without nagging the user. See [YOCTO #671] for more details. (From OE-Core rev: 074ca832c0274e0e92698b4d006ef2708be105b8) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com> Cc: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-buildenv-internal23
1 files changed, 15 insertions, 8 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 117b0c593e..61ac18c14e 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -28,14 +28,21 @@ if [ "x$BDIR" = "x" ]; then
28 if [ "x$1" = "x" ]; then 28 if [ "x$1" = "x" ]; then
29 BDIR="build" 29 BDIR="build"
30 else 30 else
31 BDIR=`readlink -f "$1"` 31 BDIR="$1"
32 if [ -z "$BDIR" ]; then 32 if [ "$BDIR" = "/" ]; then
33 if expr "$1" : '.*/$' >/dev/null; then 33 echo >&2 "Error: / is not supported as a build directory."
34 echo >&2 "Error: please remove any trailing / in the argument." 34 return 1
35 else 35 fi
36 PARENTDIR=`dirname "$1"` 36
37 echo >&2 "Error: the directory $PARENTDIR doesn't exist?" 37 # Remove any possible trailing slashes. This is used to work around
38 fi 38 # buggy readlink in Ubuntu 10.04 that doesn't ignore trailing slashes
39 # and hence "readlink -f new_dir_to_be_created/" returns empty.
40 BDIR=`echo $BDIR | sed -re 's|/+$||'`
41
42 BDIR=`readlink -f "$BDIR"`
43 if [ -z "$BDIR" ]; then
44 PARENTDIR=`dirname "$1"`
45 echo >&2 "Error: the directory $PARENTDIR does not exist?"
39 return 1 46 return 1
40 fi 47 fi
41 fi 48 fi