From 70a16efaa662a95646e82c88d3295986e1db416f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 12 Aug 2013 11:41:49 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/oe-setup-builddir') diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index d5d8d980d3..adb55c7c38 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 -- cgit v1.2.3-54-g00ecf