From 139b12ae78089452dd23699e5ef845fb829ef680 Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Tue, 21 Jun 2022 14:53:08 -0400 Subject: [PATCH] Revert "Support to return software_version_string with : on linux platform (#19710)" (#19786) This reverts commit 8da6fc83142882f4257133d3a8b168cecdea90ba. --- examples/chef/chef.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/examples/chef/chef.py b/examples/chef/chef.py index f75dbe47034a48..fafad0178952b7 100755 --- a/examples/chef/chef.py +++ b/examples/chef/chef.py @@ -490,10 +490,6 @@ def main(argv: Sequence[str]) -> None: # if options.do_build: - branch = shell.run_cmd( - "git branch | awk -v FS=' ' '/\*/{print $NF}' | sed 's|[()]||g'", return_cmd_output=True).replace("\n", "") - commit_id = shell.run_cmd("git rev-parse HEAD", return_cmd_output=True).replace("\n", "") - if options.use_zzz: flush_print("Using pre-generated ZAP output") zzz_dir = os.path.join(_CHEF_SCRIPT_PATH, @@ -579,7 +575,7 @@ def main(argv: Sequence[str]) -> None: chip_shell_cmd_server = false chip_build_libshell = true chip_config_network_layer_ble = false - target_defines = ["CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID={options.vid}", "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID={options.pid}", "CONFIG_ENABLE_PW_RPC={'1' if options.do_rpc else '0'}", "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING=\\"{branch}:{commit_id}\\""] + target_defines = ["CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID={options.vid}", "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID={options.pid}", "CONFIG_ENABLE_PW_RPC={'1' if options.do_rpc else '0'}"] """)) with open(f"{_CHEF_SCRIPT_PATH}/linux/sample.gni", "w") as f: f.write(textwrap.dedent(f"""\