Skip to content

Commit a03d2a6

Browse files
committed
Resolved the build failure for m5-stack ipv6 only test
1 parent 4048e57 commit a03d2a6

File tree

6 files changed

+16
-0
lines changed

6 files changed

+16
-0
lines changed

examples/chef/chef.py

+4
Original file line numberDiff line numberDiff line change
@@ -706,9 +706,13 @@ def main() -> int:
706706
if sys.platform == "darwin":
707707
shell.run_cmd(
708708
"sed -i '' 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
709+
shell.run_cmd(
710+
"sed -i '' 's/CONFIG_LWIP_IPV4=y/#\\ CONFIG_LWIP_IPV4\\ is\\ not\\ set/g' sdkconfig ")
709711
else:
710712
shell.run_cmd(
711713
"sed -i 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
714+
shell.run_cmd(
715+
"sed -i 's/CONFIG_LWIP_IPV4=y/#\\ CONFIG_LWIP_IPV4\\ is\\ not\\ set/g' sdkconfig ")
712716

713717
shell.run_cmd("idf.py build")
714718
shell.run_cmd("idf.py build flashing_script")

examples/chef/esp32/sdkconfig.defaults

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=y
3939
# disable IPV4
4040
# CONFIG_DISABLE_IPV4 is not set
4141

42+
# lwip IPV4 config
43+
CONFIG_LWIP_IPV4=y
44+
4245
# Use a custom partition table
4346
CONFIG_PARTITION_TABLE_CUSTOM=y
4447
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

examples/chef/esp32/sdkconfig_rpc.defaults

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=y
3636
# disable IPV4
3737
# CONFIG_DISABLE_IPV4 is not set
3838

39+
# lwip configuration
40+
CONFIG_LWIP_IPV4=y
41+
3942
# Use a custom partition table
4043
CONFIG_PARTITION_TABLE_CUSTOM=y
4144
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

examples/platform/esp32/Rpc.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,15 @@ class Esp32WiFi final : public WiFi
197197
return pw::OkStatus();
198198
}
199199

200+
#if CHIP_DEVICE_CONFIG_ENABLE_IPV4
200201
pw::Status GetIP4Address(const pw_protobuf_Empty & request, chip_rpc_IP4Address & response) override
201202
{
202203
esp_netif_ip_info_t ip_info;
203204
PW_TRY(EspToPwStatus(esp_netif_get_ip_info(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"), &ip_info)));
204205
snprintf(response.address, sizeof(response.address), IPSTR, IP2STR(&ip_info.ip));
205206
return pw::OkStatus();
206207
}
208+
#endif
207209

208210
pw::Status GetIP6Address(const pw_protobuf_Empty & request, chip_rpc_IP6Address & response) override
209211
{

scripts/build/builders/esp32.py

+2
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ def generate(self):
197197
if not self.enable_ipv4:
198198
self._Execute(
199199
['bash', '-c', 'echo -e "\\nCONFIG_DISABLE_IPV4=y\\n" >>%s' % shlex.quote(defaults_out)])
200+
self._Execute(
201+
['bash', '-c', 'echo -e "\\nCONFIG_LWIP_IPV4=n\\n" >>%s' % shlex.quote(defaults_out)])
200202

201203
if self.enable_insights_trace:
202204
insights_flag = 'y'

scripts/build/testdata/dry_run_esp32-m5stack-all-clusters-minimal-rpc-ipv6only.txt

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
1010

1111
bash -c 'echo -e "\nCONFIG_DISABLE_IPV4=y\n" >>{out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults'
1212

13+
bash -c 'echo -e "\nCONFIG_LWIP_IPV4=n\n" >>{out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults'
14+
1315
bash -c 'echo -e "\nCONFIG_ESP_INSIGHTS_ENABLED=n\nCONFIG_ENABLE_ESP_INSIGHTS_TRACE=n\n" >>{out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults'
1416

1517
bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;

0 commit comments

Comments
 (0)