summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-08-12 10:41:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-13 22:06:03 (GMT)
commit70a16efaa662a95646e82c88d3295986e1db416f (patch)
tree8a6677693a5a46a408327c7d8ecca8dcafd207ae /scripts
parent08aabd47b2d2f641066ee99530320226bc98b90f (diff)
downloadpoky-70a16efaa662a95646e82c88d3295986e1db416f.tar.gz
oe-setup-builddir: substitute ##OEROOT## when using templates
oe-setup-builddir substitutes ##COREBASE## which seems like it should have the same value as the variable ${COREBASE}. In reality it doesn't as ##COREBASE## is substituted with the value of $OEROOT (the location of the oe-init-build-env script), whereas ${COREBASE} is set by oe-core to the parent directory of meta/. If oe-core's meta/ isn't a top-level directory then ##COREBASE## and ${COREBASE} have different values, which can lead to confusion. To resolve this, deprecate (but still substitute) ##COREBASE## and substitute ##OEROOT# for $OEROOT. (From OE-Core rev: 1890783928dd1c73105fae32fb6c588afc287ff6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-builddir5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index d5d8d98..adb55c7 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -101,7 +101,10 @@ EOM
101 101
102 # Put the abosolute path to the layers in bblayers.conf so we can run 102 # Put the abosolute path to the layers in bblayers.conf so we can run
103 # bitbake without the init script after the first run 103 # bitbake without the init script after the first run
104 sed "s|##COREBASE##|$OEROOT|g" $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf 104 sed "s|##OEROOT##|$OEROOT|g" $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf
105 # ##COREBASE## is deprecated as it's meaning was inconsistent, but continue
106 # to replace it for compatibility.
107 sed -i -e "s|##COREBASE##|$OEROOT|g" $BUILDDIR/conf/bblayers.conf
105fi 108fi
106 109
107# Prevent disturbing a new GIT clone in same console 110# Prevent disturbing a new GIT clone in same console