diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-09-01 16:23:28 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-02 15:54:45 +0100 |
| commit | 9da0dd350a451676e3d4a1f09f90ec0234047ab7 (patch) | |
| tree | 23c3ef3e4c572523af6f08e0837209aa575a2067 /scripts | |
| parent | a76700a47c227e76551d2f2c86db5841ad7f6e8f (diff) | |
| download | openembedded-core-contrib-9da0dd350a451676e3d4a1f09f90ec0234047ab7.tar.gz | |
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 <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oe-setup-builddir | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5b7d92089c..728242901c 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 |