diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-09-06 18:43:34 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-08 14:55:51 +0100 |
| commit | 49e75009780a09873dc3987ae1c40f2ac95bc667 (patch) | |
| tree | e55662c1b6afc96d8643e6d31f5462c0e1f40cf2 /scripts | |
| parent | a5aa5065d5ebe9f320cb1415c6ff4d5d5772f630 (diff) | |
| download | openembedded-core-49e75009780a09873dc3987ae1c40f2ac95bc667.tar.gz | |
oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is
Before commit 7b96dc80 (scripts/oe-setup-builddir: write to
conf/templateconf.cfg after the build is set up), the path written to
templateconf.cfg was relative if $TEMPLATECONF was relative, but
afterwards it became absolute.
Restore the original behavior of saving the relative path to
templateconf.cfg.
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-x | scripts/oe-setup-builddir | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index f86b8e90ed..7136572a4d 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -46,7 +46,10 @@ fi . "$OEROOT/.templateconf" -# +# Keep the original TEMPLATECONF before possibly prefixing it with $OEROOT below. +ORG_TEMPLATECONF=$TEMPLATECONF + +# # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf # if [ -n "$TEMPLATECONF" ]; then @@ -131,5 +134,5 @@ fi unset OECORENOTESCONF if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then - echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" + echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" fi |