summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-04-13 16:30:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:33:24 +0100
commit42131b6250ed5718bc69a80cbd732dee1e2c8db0 (patch)
treec5af51fc21a3c6d5be279bdcc664ab55cd72ce95 /scripts
parent0fa5b047cc7ff339db40ba0615fc58b496621f37 (diff)
downloadpoky-42131b6250ed5718bc69a80cbd732dee1e2c8db0.tar.gz
oe-init-build-env: fix for build dirs that have spaces in their path
Enclose expansions of BUILDDIR in quotes in order to correctly handle paths which include spaces. (From OE-Core rev: 0c08723cf5ebc1a7df7dc4ca36cffa090286468c) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-builddir10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index f73aa3416d..add0b50e25 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -23,7 +23,7 @@ if [ -z "$BUILDDIR" ]; then
23 exit 1 23 exit 1
24fi 24fi
25 25
26mkdir -p $BUILDDIR/conf 26mkdir -p "$BUILDDIR/conf"
27 27
28if [ ! -d "$BUILDDIR" ]; then 28if [ ! -d "$BUILDDIR" ]; then
29 echo >&2 "Error: The builddir ($BUILDDIR) does not exist!" 29 echo >&2 "Error: The builddir ($BUILDDIR) does not exist!"
@@ -38,13 +38,13 @@ fi
38cd "$BUILDDIR" 38cd "$BUILDDIR"
39 39
40if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then 40if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then
41 TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) 41 TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg")
42fi 42fi
43 43
44. $OEROOT/.templateconf 44. $OEROOT/.templateconf
45 45
46if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then 46if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then
47 echo "$TEMPLATECONF" >$BUILDDIR/conf/templateconf.cfg 47 echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
48fi 48fi
49 49
50# 50#
@@ -79,7 +79,7 @@ advantage of multiple cores for example. See the file for more information as
79common configuration options are commented. 79common configuration options are commented.
80 80
81EOM 81EOM
82 cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf 82 cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf"
83 SHOWYPDOC=yes 83 SHOWYPDOC=yes
84fi 84fi
85 85
@@ -100,7 +100,7 @@ EOM
100 # to replace it for compatibility. 100 # to replace it for compatibility.
101 sed -e "s|##OEROOT##|$OEROOT|g" \ 101 sed -e "s|##OEROOT##|$OEROOT|g" \
102 -e "s|##COREBASE##|$OEROOT|g" \ 102 -e "s|##COREBASE##|$OEROOT|g" \
103 $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf 103 $OECORELAYERCONF > "$BUILDDIR/conf/bblayers.conf"
104 SHOWYPDOC=yes 104 SHOWYPDOC=yes
105fi 105fi
106 106