From 821cf70f093663b29eb9e8e25b3e148e28dc1421 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 6 Sep 2022 18:43:34 +0200 Subject: [PATCH] oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index b06880c9cb..201cea30bf 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -46,7 +46,10 @@ fi . "$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 # if [ -n "$TEMPLATECONF" ]; then @@ -131,5 +134,5 @@ fi unset OECORENOTESCONF if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then - echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" + echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" fi