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.

(From OE-Core rev: 7b96dc80298af6f669c885056a80a48bdd50e547)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2022-09-02 14:02:02 +02:00 committed by Richard Purdie
parent 7ef1feefa4
commit 57536f640a

View File

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