summaryrefslogtreecommitdiff
path: root/scripts/oe-setup-builddir
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-08-12 11:41:49 +0100
committerSaul Wold <sgw@linux.intel.com>2013-08-13 10:13:20 -0700
commit1890783928dd1c73105fae32fb6c588afc287ff6 (patch)
tree10ac2ce1f14df757a3a2ff90318febefc689202a /scripts/oe-setup-builddir
parent767383ac80bd52a51d52655f95bb503cd0bb827b (diff)
downloadopenembedded-core-1890783928dd1c73105fae32fb6c588afc287ff6.tar.gz
openembedded-core-1890783928dd1c73105fae32fb6c588afc287ff6.tar.bz2
openembedded-core-1890783928dd1c73105fae32fb6c588afc287ff6.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'scripts/oe-setup-builddir')
-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 591913f8bc..a869fdc7c0 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -101,7 +101,10 @@ EOM
# Put the abosolute path to the layers in bblayers.conf so we can run
# bitbake without the init script after the first run
- sed "s|##COREBASE##|$OEROOT|g" $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf
+ sed "s|##OEROOT##|$OEROOT|g" $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf
+ # ##COREBASE## is deprecated as it's meaning was inconsistent, but continue
+ # to replace it for compatibility.
+ sed -i -e "s|##COREBASE##|$OEROOT|g" $BUILDDIR/conf/bblayers.conf
fi
# Prevent disturbing a new GIT clone in same console