From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Tue, 6 Sep 2022 16:43:34 +0000 (+0200)
Subject: oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3002
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49e75009780a09873dc3987ae1c40f2ac95bc667;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

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>
---

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index f86b8e90ed0..7136572a4d9 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