From a6fc9bf2464a7afceb69e11c678404dc2071c87a Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland@espressif.com>
Date: Wed, 11 Sep 2019 11:18:18 +0200
Subject: [PATCH] Use kconfiglib from $IDF_PATH/tools/kconfig_new

---
 tools/kconfig_new/confgen.py         | 7 ++++++-
 tools/kconfig_new/confserver.py      | 7 ++++++-
 tools/kconfig_new/gen_kconfig_doc.py | 9 ++++++++-
 tools/ldgen/sdkconfig.py             | 6 +++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/tools/kconfig_new/confgen.py b/tools/kconfig_new/confgen.py
index 0af2be1bc..11b3427e7 100755
--- a/tools/kconfig_new/confgen.py
+++ b/tools/kconfig_new/confgen.py
@@ -30,7 +30,12 @@ import sys
 import tempfile
 
 import gen_kconfig_doc
-import kconfiglib
+
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
 
 __version__ = "0.1"
 
diff --git a/tools/kconfig_new/confserver.py b/tools/kconfig_new/confserver.py
index cddb572c9..b02a2f1ce 100755
--- a/tools/kconfig_new/confserver.py
+++ b/tools/kconfig_new/confserver.py
@@ -7,12 +7,17 @@ from __future__ import print_function
 import argparse
 import confgen
 import json
-import kconfiglib
 import os
 import sys
 import tempfile
 from confgen import FatalError, __version__
 
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
+
 # Min/Max supported protocol versions
 MIN_PROTOCOL_VERSION = 1
 MAX_PROTOCOL_VERSION = 2
diff --git a/tools/kconfig_new/gen_kconfig_doc.py b/tools/kconfig_new/gen_kconfig_doc.py
index 6d6d7b1fa..5d9f41c0c 100644
--- a/tools/kconfig_new/gen_kconfig_doc.py
+++ b/tools/kconfig_new/gen_kconfig_doc.py
@@ -21,8 +21,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import print_function
+import os
 import re
-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 = '    '
diff --git a/tools/ldgen/sdkconfig.py b/tools/ldgen/sdkconfig.py
index 943013dfc..28ea6b0f4 100644
--- a/tools/ldgen/sdkconfig.py
+++ b/tools/ldgen/sdkconfig.py
@@ -19,11 +19,11 @@ from pyparsing import Word, alphanums, printables, Combine, Literal, hexnums, qu
 
 import sys
 try:
-    import kconfiglib
-except ImportError:
+    from . import kconfiglib
+except Exception:
     parent_dir_name = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
     kconfig_new_dir = os.path.abspath(parent_dir_name + "/kconfig_new")
-    sys.path.append(kconfig_new_dir)
+    sys.path.insert(0, kconfig_new_dir)
     import kconfiglib