[PATCH v2 11/15] kconfig: fix select conversion for BPAUTO_ symbols in integration mode

Thomas Pedersen <[email protected]> Fri, 13 May 2022 09:05:19 -0700
Newsgroups org.kernel.vger.backports
Message-ID <[email protected]>
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 <[email protected]>
---
 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