diff options
| author |   Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com> | 2021-03-27 21:29:52 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-04-30 08:24:02 +0000 |
| commit | d5647a16bc23a24ffdec68d61a6b2deebb2cb944 (patch) | |
| tree | cbb23391f9b7a6195a949113b381fbfeaff86ea9 | |
| parent | 384499f6ac1ca89b89a7b9599c12a69662f459e1 (diff) | |
aglsetup: Override templateconf.cfg in case of -f, --force.jellyfish
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
| -rwxr-xr-x | scripts/.aglsetup_genconfig.bash | 1 |
1 files changed, 1 insertions, 0 deletions
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 |