aglsetup: Override templateconf.cfg in case of -f, --force. 57/26257/3 jellyfish
authorVasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
Sat, 27 Mar 2021 20:29:52 +0000 (21:29 +0100)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Fri, 30 Apr 2021 08:24:02 +0000 (08:24 +0000)
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
(cherry picked from commit 88dafb8b670177cde6d361118e1e6cb0da4292ab)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26257

scripts/.aglsetup_genconfig.bash

index 323479c..b9f4e5e 100755 (executable)
@@ -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