From 569d4cd3257ec26c63489d2b016bfac83a5fa244 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 28 Sep 2022 10:56:35 +0200 Subject: scripts/oe-setup-builddir: do not read TEMPLATECONF from templateconf.cfg Also, write to it only if it does not already exist. As discussed here[1], reading from templateconf.cfg serves no purpose: it exists only if the build directory has already been initialized, and so the scripts will not change anything in the build directory anyway. My adjustment is to keep the file however; it is useful as a pointer to the original template, which can be utilized by config management tools in the future. [1] https://lists.openembedded.org/g/openembedded-architecture/topic/template_handling_in_oe_core/93968540 (From OE-Core rev: bcfaeb8ed503ce1a5add3ec882f0e0c3bccfd3d2) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'scripts') diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index e3c8c6d437..a13860c7d9 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -34,16 +34,6 @@ chmod -st "$BUILDDIR/conf" 2>/dev/null || echo "WARNING: unable to chmod $BUILDD cd "$BUILDDIR" || die "Failed to change directory to $BUILDDIR!" -if [ -z "$TEMPLATECONF" ] && [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then - TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") - # The following two are no longer valid; unsetting them will automatically get them replaced - # with correct ones. - if [ "$TEMPLATECONF" = meta/conf ] || [ "$TEMPLATECONF" = meta-poky/conf ]; then - unset TEMPLATECONF - rm "$BUILDDIR/conf/templateconf.cfg" - fi -fi - . "$OEROOT/.templateconf" # Keep the original TEMPLATECONF before possibly prefixing it with $OEROOT below. @@ -132,4 +122,6 @@ fi [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" unset OECORENOTESCONF -echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" +if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then + echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" +fi -- cgit v1.2.3-54-g00ecf