From bfa02f71d86880781afb9e985b823c3add459162 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 1 Sep 2022 16:23:28 +0200 Subject: 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. (From OE-Core rev: 9da0dd350a451676e3d4a1f09f90ec0234047ab7) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index bf832ee0ca..32bc6580eb 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 -- cgit v1.2.3-54-g00ecf