From: Alexander Kanavin Date: Thu, 1 Sep 2022 14:23:28 +0000 (+0200) Subject: scripts/oe-setup-builddir: migrate build/conf/templateconf.cfg to new template locations X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3055 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9da0dd350a451676e3d4a1f09f90ec0234047ab7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git scripts/oe-setup-builddir: migrate build/conf/templateconf.cfg to new template locations This is done only for default oe-core/poky templates; for anything else the locations themselves need to be migrated first, and there is no way to tell where they would be. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5b7d92089c3..728242901c1 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -40,6 +40,12 @@ cd "$BUILDDIR" if [ -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" -o $TEMPLATECONF = "meta-poky/conf" ]; then + unset TEMPLATECONF + rm $BUILDDIR/conf/templateconf.cfg + fi fi . "$OEROOT"/.templateconf