All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH] scripts/oe-setup-builddir: migrate build/conf/templateconf.cfg to new template locations
Date: Thu,  1 Sep 2022 16:23:28 +0200	[thread overview]
Message-ID: <20220901142328.268769-1-alex@linutronix.de> (raw)

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>
---
 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
-- 
2.30.2



             reply	other threads:[~2022-09-01 14:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-01 14:23 Alexander Kanavin [this message]
2022-09-02  0:12 ` [OE-core] [PATCH] scripts/oe-setup-builddir: migrate build/conf/templateconf.cfg to new template locations Peter Kjellerstedt
2022-09-02  4:31   ` Alexander Kanavin
2022-09-02 14:47     ` Peter Kjellerstedt
2022-09-02 15:08       ` Alexander Kanavin
2022-09-02 15:41         ` Peter Kjellerstedt
2022-09-02 16:50           ` Alexander Kanavin
     [not found]   ` <1710F0E3F6A43399.12033@lists.openembedded.org>
2022-09-02  7:16     ` Alexander Kanavin
2022-09-02  7:37       ` Richard Purdie
2022-09-02  7:41         ` Alexander Kanavin
     [not found]         ` <1710FB3AA9843A6F.13805@lists.openembedded.org>
2022-09-02 10:57           ` Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220901142328.268769-1-alex@linutronix.de \
    --to=alex.kanavin@gmail.com \
    --cc=alex@linutronix.de \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.