MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/oe-setup-builddir: do not read TEMPLATECONF from templateconf.cfg

Browse Source 
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 <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2022-09-28 10:56:35 +02:00 committed by Richard Purdie
parent e14a481661
commit 569d4cd325
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/oe-setup-builddir
View File

@ -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!" 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" . "$OEROOT/.templateconf"
# Keep the original TEMPLATECONF before possibly prefixing it with $OEROOT below. # Keep the original TEMPLATECONF before possibly prefixing it with $OEROOT below.
@ -132,4 +122,6 @@ fi
[ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF"
unset 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