From: Thomas Pedersen <thomas@adapt-ip.com>
To: backports <backports@vger.kernel.org>
Cc: Hauke Mehrtens <hauke@hauke-m.de>,
Luis Rodriguez <mcgrof@kernel.org>,
Thomas Pedersen <thomas@adapt-ip.com>
Subject: [PATCH 7/7] kconfig: fix select conversion for BPAUTO_ symbols in integration mode
Date: Tue, 23 Nov 2021 21:55:05 -0800 [thread overview]
Message-ID: <20211124055505.1267128-8-thomas@adapt-ip.com> (raw)
In-Reply-To: <20211124055505.1267128-1-thomas@adapt-ip.com>
In integration mode, the bpid.project_prefix is nonzero
and needs to be prepended to the expected symbol to get a
match.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
---
lib/kconfig.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/kconfig.py b/lib/kconfig.py
index a77f8a54eea7..0b5f8ebc1726 100644
--- a/lib/kconfig.py
+++ b/lib/kconfig.py
@@ -228,9 +228,10 @@ class ConfigTree(object):
out = ''
for l in open(os.path.join(self.bpid.target_dir, nf), 'r'):
m = sel_line.match(l)
+ bpauto_prefix = self.bpid.project_prefix + 'BPAUTO_'
if m and not m.group('sym') in syms:
- if 'BPAUTO_' + m.group('sym') in syms:
- out += m.group('spc') + "select BPAUTO_" + m.group('sym') + '\n'
+ if bpauto_prefix + m.group('sym') in syms:
+ out += m.group('spc') + "select " + bpauto_prefix + m.group('sym') + '\n'
else:
out += m.group('spc') + "depends on " + m.group('sym') + '\n'
else:
--
2.30.2
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2021-11-24 6:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 5:54 [PATCH 0/7] Resurrect backports Integration Mode Thomas Pedersen
2021-11-24 5:54 ` [PATCH 1/7] backport: refresh integration patch Thomas Pedersen
2021-11-28 21:50 ` Hauke Mehrtens
2021-12-02 19:51 ` Thomas Pedersen
2021-11-24 5:55 ` [PATCH 2/7] backport: resurrect integrations Thomas Pedersen
2021-11-24 5:55 ` [PATCH 3/7] gentree: try to make patch operation idempotent in case of --clean Thomas Pedersen
2021-11-24 5:55 ` [PATCH 4/7] gentree: do not prefix Kernel.local symbols Thomas Pedersen
2021-11-24 5:55 ` [PATCH 5/7] lib/bpversion: calculate Kconfig.versions for next major version Thomas Pedersen
2021-11-24 5:55 ` [PATCH 6/7] backport: expose BP_MODULES in package mode only Thomas Pedersen
2021-11-24 5:55 ` Thomas Pedersen [this message]
2021-11-24 13:57 ` [PATCH 0/7] Resurrect backports Integration Mode Luis Chamberlain
2021-11-25 4:00 ` Thomas Pedersen
2022-02-04 2:22 ` Luis Chamberlain
2022-02-04 21:41 ` Luis Chamberlain
2021-11-28 21:52 ` Hauke Mehrtens
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=20211124055505.1267128-8-thomas@adapt-ip.com \
--to=thomas@adapt-ip.com \
--cc=backports@vger.kernel.org \
--cc=hauke@hauke-m.de \
--cc=mcgrof@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).