Explorar o código

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 <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Alexander Kanavin %!s(int64=2) %!d(string=hai) anos
pai
achega
bfa02f71d8
Modificáronse 1 ficheiros con 6 adicións e 0 borrados
  1. 6 0
      scripts/oe-setup-builddir

+ 6 - 0
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