Skip to content

Commit

Permalink
Chef to support disabling IPv4 on ESP32 (#23174)
Browse files Browse the repository at this point in the history 
* Chef to support disabling IPv4 on ESP32

The current Chef can only support disabling IPv4 on Linux.
However, ESP32 that can disable IPv4 is not supported by Chef.
This commit is for fixing this.

* Restyled by autopep8

* Rename Chef option ipv6only to enable_ipv4

* [Chef] Fix cicd when renaming option ipv6only

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
@erwinpan1 @restyled-commits
erwinpan1 and restyled-commits authored Oct 14, 2022
1 parent d1f0c55 commit 9f08fc1
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 23 deletions.
63 changes: 42 additions & 21 deletions examples/chef/chef.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ def main() -> int:
parser.add_option(
"", "--ci", help="Builds Chef examples defined in cicd_config. Uses --use_zzz. Uses specified target from -t. Chef exits after completion.", dest="ci", action="store_true")
parser.add_option(
"", "--ipv6only", help="Compile build which only supports ipv6. Linux only.",
action="store_true")
"", "--enable_ipv4", help="Enable IPv4 mDNS. Only applicable to platforms that can support IPV4 (e.g, Linux, ESP32)",
action="store_true", default=False)
parser.add_option(
"", "--cpu_type", help="CPU type to compile for. Linux only.", choices=["arm64", "arm", "x64"])

Expand Down Expand Up @@ -533,6 +533,16 @@ def main() -> int:
elif options.build_target == "Ameba":
flush_print("Ameba toolchain update not supported. Skipping")

#
# Clean environment
#
if options.do_clean:
if options.build_target == "esp32":
shell.run_cmd(f"rm -f {_CHEF_SCRIPT_PATH}/esp32/sdkconfig")
shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
shell.run_cmd(f"rm -rf {_CHEF_SCRIPT_PATH}/esp32/build")
shell.run_cmd("idf.py fullclean")

#
# Cluster customization
#
Expand All @@ -552,6 +562,27 @@ def main() -> int:
# af-gen-event.h is not generated
shell.run_cmd(f"touch {gen_dir}/af-gen-event.h")

#
# Setup environment
#
if options.do_rpc:
flush_print("RPC PW enabled")
if options.build_target == "esp32":
shell.run_cmd(
f"export SDKCONFIG_DEFAULTS={_CHEF_SCRIPT_PATH}/esp32/sdkconfig_rpc.defaults")
shell.run_cmd(
f"[ -f {_CHEF_SCRIPT_PATH}/esp32/sdkconfig ] || cp {_CHEF_SCRIPT_PATH}/esp32/sdkconfig_rpc.defaults {_CHEF_SCRIPT_PATH}/esp32/sdkconfig")
else:
flush_print(f"RPC PW on {options.build_target} not supported")

else:
flush_print("RPC PW disabled")
if (options.build_target == "esp32"):
shell.run_cmd(
f"export SDKCONFIG_DEFAULTS={_CHEF_SCRIPT_PATH}/esp32/sdkconfig.defaults")
shell.run_cmd(
f"[ -f {_CHEF_SCRIPT_PATH}/esp32/sdkconfig ] || cp {_CHEF_SCRIPT_PATH}/esp32/sdkconfig.defaults {_CHEF_SCRIPT_PATH}/esp32/sdkconfig")

#
# Menuconfig
#
Expand Down Expand Up @@ -611,19 +642,6 @@ def main() -> int:
shutil.rmtree(gen_dir, ignore_errors=True)
shutil.copytree(zzz_dir, gen_dir)
flush_print("Building...")
if options.do_rpc:
flush_print("RPC PW enabled")
if options.build_target == "esp32":
shell.run_cmd(
f"export SDKCONFIG_DEFAULTS={_CHEF_SCRIPT_PATH}/esp32/sdkconfig_rpc.defaults")
else:
flush_print(f"RPC PW on {options.build_target} not supported")

else:
flush_print("RPC PW disabled")
if (options.build_target == "esp32"):
shell.run_cmd(
f"export SDKCONFIG_DEFAULTS={_CHEF_SCRIPT_PATH}/esp32/sdkconfig.defaults")

flush_print(
f"Product ID 0x{options.pid:02X} / Vendor ID 0x{options.vid:02X}")
Expand All @@ -640,11 +658,12 @@ def main() -> int:

if options.build_target == "esp32":
shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
if options.do_clean:
shell.run_cmd(f"rm -f {_CHEF_SCRIPT_PATH}/esp32/sdkconfig")
shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
shell.run_cmd(f"rm -rf {_CHEF_SCRIPT_PATH}/esp32/build")
shell.run_cmd("idf.py fullclean")
if options.enable_ipv4:
shell.run_cmd(
f"sed -i 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
else:
shell.run_cmd(
f"sed -i 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
shell.run_cmd("idf.py build")
shell.run_cmd("idf.py build flashing_script")
shell.run_cmd(
Expand Down Expand Up @@ -762,7 +781,9 @@ def main() -> int:
flush_print(
f"Unable to cross compile for x64 on {uname_resp}")
exit(1)
if options.ipv6only:
if options.enable_ipv4:
linux_args.append("chip_inet_config_enable_ipv4=true")
else:
linux_args.append("chip_inet_config_enable_ipv4=false")

if sw_ver_string:
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/cicd_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"ci_allow_list": ["rootnode_dimmablelight_bCwGYSDpoe"],
"cd_platforms": {
"linux": {
"linux_x86": ["--cpu_type", "x64", "-a"],
"linux_arm64_ipv6only": ["--cpu_type", "arm64", "--ipv6only", "-a"]
"linux_x86": ["--cpu_type", "x64", "--enable_ipv4", "-a"],
"linux_arm64_ipv6only": ["--cpu_type", "arm64", "-a"]
},
"esp32": {
"m5stack": ["-a"]
Expand Down
3 changes: 3 additions & 0 deletions examples/chef/esp32/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ CONFIG_BT_NIMBLE_ENABLED=y
#enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y

# disable IPV4
# CONFIG_DISABLE_IPV4 is not set

# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
Expand Down
3 changes: 3 additions & 0 deletions examples/chef/esp32/sdkconfig_rpc.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ CONFIG_BT_NIMBLE_ENABLED=y
#enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y

# disable IPV4
# CONFIG_DISABLE_IPV4 is not set

# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
Expand Down

0 comments on commit 9f08fc1

Please sign in to comment.