Merge branch 'bugfix/use_local_kconfiglib_v3.1' into 'release/v3.1'

Use kconfiglib from $IDF_PATH/tools/kconfig_new (v3.1)

See merge request espressif/esp-idf!6082

tools/kconfig_new/confgen.py

@@ -28,8 +28,12 @@ import tempfile
 import json
 
 import gen_kconfig_doc
-import kconfiglib
 import pprint
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
 
 __version__ = "0.1"
 

tools/kconfig_new/confserver.py

@@ -6,12 +6,17 @@
 from __future__ import print_function
 import argparse
 import json
-import kconfiglib
 import os
 import sys
 import confgen
 from confgen import FatalError, __version__
 
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
+
 def main():
     parser = argparse.ArgumentParser(description='confserver.py v%s - Config Generation Tool' % __version__, prog=os.path.basename(sys.argv[0]))
 

tools/kconfig_new/gen_kconfig_doc.py

@@ -21,7 +21,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
-import kconfiglib
+import sys
+
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
 
 # Indentation to be used in the generated file
 INDENT = '    '