diff mbox series

[1/2] oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is

Message ID 20220906164335.2629721-1-pkj@axis.com
State Accepted, archived
Commit 49e75009780a09873dc3987ae1c40f2ac95bc667
Headers show
Series [1/2] oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is | expand

Commit Message

Peter Kjellerstedt Sept. 6, 2022, 4:43 p.m. UTC 
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>
---

These two patches are intended to be applied on top of the three I
sent earlier today.

And in case anyone wonders, yes, I occasionally move entire build
trees (typically from my SSD to my HDD) so I would prefer the path in
templateconf.cfg to remain relative.

 scripts/oe-setup-builddir | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index b06880c9cb..201cea30bf 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