From 358720349581daeb7a4bdfc8588e61df6333886d Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland@espressif.com>
Date: Sun, 13 Dec 2020 08:03:58 +0100
Subject: [PATCH] tools: Invoke menuconfig as named module

Closes https://github.com/espressif/esp-idf/issues/6248
---
 make/project_config.mk          |  2 +-
 tools/cmake/kconfig.cmake       |  2 +-
 tools/kconfig_new/menuconfig.py | 43 ---------------------------------
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 tools/kconfig_new/menuconfig.py

diff --git a/make/project_config.mk b/make/project_config.mk
index 7c5c901aa6..0f481545a4 100644
--- a/make/project_config.mk
+++ b/make/project_config.mk
@@ -105,7 +105,7 @@ export MENUCONFIG_STYLE ?= aquatic
 ifeq ($(OS),Windows_NT)
 MENUCONFIG_CMD := $(KCONFIG_TOOL_DIR)/mconf-idf
 else
-MENUCONFIG_CMD := $(PYTHON) $(IDF_PATH)/tools/kconfig_new/menuconfig.py
+MENUCONFIG_CMD := $(PYTHON) -m menuconfig
 endif
 
 .PHONY: term_check
diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake
index a14172bcee..1bf8ab5e9b 100644
--- a/tools/cmake/kconfig.cmake
+++ b/tools/cmake/kconfig.cmake
@@ -257,7 +257,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
 
         set(MENUCONFIG_CMD ${mconf})
     else()
-        set(MENUCONFIG_CMD ${python} ${idf_path}/tools/kconfig_new/menuconfig.py)
+        set(MENUCONFIG_CMD ${python} -m menuconfig)
         set(TERM_CHECK_CMD ${python} ${idf_path}/tools/check_term.py)
     endif()
 
diff --git a/tools/kconfig_new/menuconfig.py b/tools/kconfig_new/menuconfig.py
deleted file mode 100644
index 645c3ca444..0000000000
--- a/tools/kconfig_new/menuconfig.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020 Espressif Systems (Shanghai) CO LTD
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from distutils.sysconfig import get_python_lib
-import os
-import subprocess
-import sys
-
-
-def main(args):
-    """
-    Helper function to invoke menuconfig.py from the kconfiglib package. It invokes menuconfig as a process because:
-    1. kconfiblib/menuconfig.py invoked directly has advantage over calling menuconfig() - Kconfiglib object needs to
-       be prepared but it still reads the sdkconfig file,
-    2. command line invoked from make/cmake can be the same for menuconfig.py and mconf-idf.
-    """
-    cmd = [sys.executable]
-
-    # path where menuconfig is installed from the kconfiglib package:
-    cmd += [os.path.join(get_python_lib(), 'menuconfig.py')]
-
-    # args is expected to be [ '$IDF_PATH/Kconfig' ]:
-    cmd += args
-
-    print('Running', ' '.join(cmd))
-    subprocess.check_call(cmd)
-
-
-if __name__ == '__main__':
-    main(sys.argv[1:])