scripts/oe-setup-builddir: make environment variable the highest priority source for TEMPLATECONF
PATCH 1/2 scripts/oe-setup-builddir: make environment variable the highest priority source for TEMPLATECONF
This sets the following order:
1. TEMPLATECONF set in the unix environment (for example as a prefix to '. oe-init-build-env').
2. If empty then $BUILDDIR/conf/templateconf.cfg
3. If absent then $OEROOT/.templateconf (oe-init-build-env sets OEROOT to where it is, which is poky or oe-core).
I believe this is more logical and consistent with common practice; it also avoids situations where the user is stuck with cryptic errors because templateconf.cfg contains something invalid and that something cannot be overridden from command line.
--- scripts/oe-setup-builddir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/oe-setup-builddir +1 -1
@@ -38,7 +38,7 @@ chmod -st "$BUILDDIR/conf" 2>/dev/null || echo "WARNING: unable to chmod $BUILDD cd "$BUILDDIR" -if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then +if [ -f "$BUILDDIR/conf/templateconf.cfg" -a -z "$TEMPLATECONF" ]; then TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") # The following two are no longer valid; unsetting them will automatically get them replaced # with correct ones.
Signature · 1 line
2.30.2
PATCH 2/2 scripts/oe-setup-builddir: write to conf/templateconf.cfg after the build is set up
This was done before any of the sanity checks or actual setup, which resulted in templateconf.cfg always getting written out, whether it would be valid or not, and the user becoming stuck with it.
--- scripts/oe-setup-builddir | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/oe-setup-builddir +4 -4
@@ -50,10 +50,6 @@ fi . "$OEROOT"/.templateconf -if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then - echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" -fi - # # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf #
@@ -140,3 +136,7 @@ if [ -z "$OECORENOTESCONF" ]; then fi [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" unset OECORENOTESCONF + +if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then + echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" +fi
Signature · 1 line
2.30.2