From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 2 Sep 2022 12:02:01 +0000 (+0200)
Subject: scripts/oe-setup-builddir: make environment variable the highest priority source... 
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3047
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7296c42b8c58e6e08f4210eb7b51d852b1ee950e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

scripts/oe-setup-builddir: make environment variable the highest priority source for TEMPLATECONF

This sets the following order:

1. TEMPLATECONF set in the unix environment (for example as a
prefix to '. oe-init-build-env').

2. If empty then $BUILDDIR/conf/templateconf.cfg

3. If absent then $OEROOT/.templateconf (oe-init-build-env sets OEROOT
to where it is, which is poky or oe-core).

I believe this is more logical and consistent with common practice;
it also avoids situations where the user is stuck with cryptic
errors because templateconf.cfg contains something invalid and
that something cannot be overridden from command line.

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 f4239fea48a..3c63e38fa9f 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -38,7 +38,7 @@ chmod -st "$BUILDDIR/conf" 2>/dev/null || echo "WARNING: unable to chmod $BUILDD
 
 cd "$BUILDDIR"
 
-if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then
+if [ -f "$BUILDDIR/conf/templateconf.cfg" -a -z "$TEMPLATECONF" ]; then
     TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg")
     # The following two are no longer valid; unsetting them will automatically get them replaced
     # with correct ones.