fix(wifi_remote): Fixup version resolution

Author: david-cermak

components/esp_wifi_remote/CMakeLists.txt

@@ -20,17 +20,6 @@ if (IDF_VER_TAG)
     endif()
 endif()
 
-# Generate Kconfig fragment to the project build dir to expand IDF_VER_DIR correctly
-set(_wifi_remote_kcfg_dir "${BUILD_DIR}/kconfig_fragments/esp_wifi_remote")
-file(MAKE_DIRECTORY "${_wifi_remote_kcfg_dir}")
-set(_wifi_remote_kcfg_fragment "${_wifi_remote_kcfg_dir}/Kconfig.version_select.in")
-
-set(_kconfig_ver_fragment "# Auto-generated: do not edit\n")
-string(APPEND _kconfig_ver_fragment "orsource \"${IDF_VER_DIR}/Kconfig.slave_select.in\"\n")
-string(APPEND _kconfig_ver_fragment "orsource \"${IDF_VER_DIR}/Kconfig.soc_wifi_caps.in\"\n")
-string(APPEND _kconfig_ver_fragment "menu \"Wi-Fi configuration\"\norsource \"${IDF_VER_DIR}/Kconfig.wifi.in\"\nendmenu\n")
-file(WRITE "${_wifi_remote_kcfg_fragment}" "${_kconfig_ver_fragment}")
-
 idf_component_get_property(wifi esp_wifi COMPONENT_LIB)
 
 if(NOT CONFIG_ESP_WIFI_ENABLED AND NOT CONFIG_ESP_HOST_WIFI_ENABLED)

components/esp_wifi_remote/Kconfig

@@ -6,8 +6,8 @@ menu "Wi-Fi Remote"
 
     if ESP_WIFI_REMOTE_ENABLED
         # Resolve version-specific includes via generated fragment located in the build directory.
-        osource "kconfig_fragments/esp_wifi_remote/Kconfig.version_select.in"
-        orsource "./Kconfig.rpc.in"
+        rsource "./Kconfig.$IDF_VERSION.in"
+        rsource "./Kconfig.rpc.in"
 
         config ESP_WIFI_REMOTE_EAP_ENABLED
             bool "Enable EAP client remote API"

components/esp_wifi_remote/Kconfig.5.3.0.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.3/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.3/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.3.1.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.3.1/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.3/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.3.2.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.3.2/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.3/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.3.3.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.3.3/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.3/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.3.4.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.3.4/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.3/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.4.0.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.4/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.4/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.4.1.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.4.1/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.4/Kconfig.in"
+endif

components/esp_wifi_remote/Kconfig.5.4.2.in

@@ -0,0 +1,6 @@
+
+orsource "./idf_tag_v5.4.2/Kconfig.in"
+
+if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
+rsource "./idf_v5.4/Kconfig.in"
+endif