From 88dafb8b670177cde6d361118e1e6cb0da4292ab Mon Sep 17 00:00:00 2001 From: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com> Date: Sat, 27 Mar 2021 21:29:52 +0100 Subject: [PATCH] aglsetup: Override templateconf.cfg in case of -f, --force. Overriding this config file was missing for some reason. Bug-AGL: SPEC-3861 Change-Id: Iddf195615291b166a05bedb5ef0ddf645265e546 Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26208 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> (cherry picked from commit d59e0aea8b31fd2d13b1bb91ba4586355743d1b6) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26171 --- scripts/.aglsetup_genconfig.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index 323479c3c..b9f4e5e94 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -496,6 +496,7 @@ EOF [[ $FORCE -eq 1 ]] && rm -f \ $BUILDDIR/conf/local.conf \ $BUILDDIR/conf/bblayers.conf \ + $BUILDDIR/conf/templateconf.cfg \ $BUILDDIR/conf/setup.* \ $BUILDDIR/conf/*.log -- 2.16.6