MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is

Browse Source 
Before commit 7b96dc80 (scripts/oe-setup-builddir: write to
conf/templateconf.cfg after the build is set up), the path written to
templateconf.cfg was relative if $TEMPLATECONF was relative, but
afterwards it became absolute.

Restore the original behavior of saving the relative path to
templateconf.cfg.

(From OE-Core rev: 49e75009780a09873dc3987ae1c40f2ac95bc667)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2022-09-06 18:43:34 +02:00 committed by Richard Purdie
parent 5db679c917
commit 821cf70f09
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/oe-setup-builddir
View File

@ -46,6 +46,9 @@ fi
. "$OEROOT/.templateconf" . "$OEROOT/.templateconf"
# Keep the original TEMPLATECONF before possibly prefixing it with $OEROOT below.
ORG_TEMPLATECONF=$TEMPLATECONF
# #
# $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf
# #
@ -131,5 +134,5 @@ fi
unset OECORENOTESCONF unset OECORENOTESCONF
if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then
echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
fi fi