From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 2 Sep 2022 12:02:02 +0000 (+0200)
Subject: scripts/oe-setup-builddir: write to conf/templateconf.cfg after the build is set up
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3048
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b96dc80298af6f669c885056a80a48bdd50e547;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

scripts/oe-setup-builddir: write to conf/templateconf.cfg after the build is set up

This was done before any of the sanity checks or actual setup, which
resulted in templateconf.cfg always getting written out, whether it
would be valid or not, and the user becoming stuck with it.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 728242901c1..f4239fea48a 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -50,10 +50,6 @@ fi
 
 . "$OEROOT"/.templateconf
 
-if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then
-    echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
-fi
-
 # 
 # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf
 #
@@ -140,3 +136,7 @@ if [ -z "$OECORENOTESCONF" ]; then
 fi
 [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF"
 unset OECORENOTESCONF
+
+if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then
+    echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
+fi