From 57536f640ad3f7bf4f4a97c27d478f1b296596a3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 2 Sep 2022 14:02:02 +0200 Subject: 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 Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 32bc6580eb..6493e46b2b 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 -- cgit v1.2.3-54-g00ecf