summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2022-09-06 18:43:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-08 14:55:51 +0100
commit37c122dfdac03a98bf2bf8c8f7676ec25136d402 (patch)
tree7f0eb2f03623f9ee431ff2edd21082b3795b73a7 /scripts
parent49e75009780a09873dc3987ae1c40f2ac95bc667 (diff)
downloadopenembedded-core-contrib-37c122dfdac03a98bf2bf8c8f7676ec25136d402.tar.gz
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-builddir4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 7136572a4d..478a1c2e04 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"