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>
This commit is contained in:
parent
08aabd47b2
commit
70a16efaa6
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue