From 16adb2be340063b796b4cff1957cd5ddf31b4f20 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 6 Sep 2022 18:43:35 +0200 Subject: [PATCH] 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. (From OE-Core rev: 37c122dfdac03a98bf2bf8c8f7676ec25136d402) Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 201cea30bf..72113c37b8 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"