From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Tue, 6 Sep 2022 16:43:35 +0000 (+0200)
Subject: oe-setup-builddir: Always update templateconf.cfg
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3001
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37c122dfdac03a98bf2bf8c8f7676ec25136d402;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oe-setup-builddir: Always update templateconf.cfg

The intent of the templateconf.cfg file is to cache the value of
$TEMPLATECONF. To do this, it needs to be updated in case TEMPLATECONF
is manually specified.

Before, the following commands:

  TEMPLATECONF=foo . oe-init-build-env
  TEMPLATECONF=bar . oe-init-build-env
  . oe-init-build-env

would cause the templates in foo to be used for the last source of
oe-init-build-env, while afterwards, bar is used as expected.

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 7136572a4d9..478a1c2e048 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -133,6 +133,4 @@ fi
 [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF"
 unset OECORENOTESCONF
 
-if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then
-    echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
-fi
+echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"