summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-08-02 14:08:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-02 14:32:10 +0100
commitbe2a2764d8ceb398d81714661e6f199c8b11946c (patch)
treea1a704af82c22a85fd1b3191a0118518604ac4b8 /oe-init-build-env
parent68bd81506fd258d8dfae077a719982f91c56dceb (diff)
downloadpoky-be2a2764d8ceb398d81714661e6f199c8b11946c.tar.gz
oe-init-build-env, scripts/oe-buildenv-internal: add error detecting for $BDIR
[YOCTO #671] "readlink -f" in Ubuntu 10.04 is buggy: it doesn't ignore a trailing / (e.g., "readlink -f /tmp/non-existent-dir/" returns nothing, but according to http://www.gnu.org/s/coreutils/manual/coreutils.pdf it should do that -- hence we get bug 671. It seems Ubuntu 10.10 or even later Ubuntu 11.04, and other Linux distributions(e.g., Open Suse 11.4) haven't such an issue. So I think we should detect this and ask Ubuntu 10.04 users to avoid supply a path with trailing slash here. Moreever, I also add the detection of non-existent path, e.g., source oe-init-build-env /non-existent-dir/build can be detected and we'll print an error msg. And, if we get errors in oe-buildenv-internal, we should stop the script and shouldn't further run. (From OE-Core rev: 651ccb3b031d9ccb8331505a51171372002230d9) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'oe-init-build-env')
-rwxr-xr-xoe-init-build-env6
1 files changed, 3 insertions, 3 deletions
diff --git a/oe-init-build-env b/oe-init-build-env
index 77332a7d63..cc30a3b191 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -35,10 +35,10 @@ else
35 fi 35 fi
36 OEROOT=`readlink -f "$OEROOT"` 36 OEROOT=`readlink -f "$OEROOT"`
37 export OEROOT 37 export OEROOT
38 . $OEROOT/scripts/oe-buildenv-internal 38 . $OEROOT/scripts/oe-buildenv-internal && \
39 $OEROOT/scripts/oe-setup-builddir 39 $OEROOT/scripts/oe-setup-builddir && \
40 [ -n "$BUILDDIR" ] && cd $BUILDDIR
40 unset OEROOT 41 unset OEROOT
41 unset BBPATH 42 unset BBPATH
42 [ -n "$BUILDDIR" ] && cd $BUILDDIR
43fi 43fi
44 44