From 41e474d58cce5f1b4e85601ab9ef59a387f355f5 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 28 Jun 2022 19:55:47 +0200
Subject: [PATCH] [python] Fix Python device library build (#20043)

* Drop chip_use_clusters_for_ip_commissioning

It has been removed from build_python.sh already a while ago in
3a466490073abb3732013b5f3ac1e135593d53e0.

* Drop unused variables
---
 scripts/build_python_device.sh                   | 9 +--------
 src/controller/python/chip/server/ServerInit.cpp | 3 ---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/scripts/build_python_device.sh b/scripts/build_python_device.sh
index 14fce377a6cdad..5f637fa41ad937 100755
--- a/scripts/build_python_device.sh
+++ b/scripts/build_python_device.sh
@@ -41,7 +41,6 @@ ENVIRONMENT_ROOT="$CHIP_ROOT/out/python_env"
 declare chip_detail_logging=false
 declare enable_pybindings=false
 declare chip_mdns
-declare clusters=true
 
 help() {
 
@@ -54,8 +53,6 @@ Input Options:
                                                             By default it is false.
   -m, --chip_mdns           ChipMDNSValue                   Specify ChipMDNSValue as platform or minimal.
                                                             By default it is minimal.
-  -c, --clusters_for_ip_commissioning  true/false           Specify whether to use clusters for IP commissioning.
-                                                            By default it is true.
   -p, --enable_pybindings   EnableValue                     Specify whether to enable pybindings as python controller.
 "
 }
@@ -76,10 +73,6 @@ while (($#)); do
             chip_mdns=$2
             shift
             ;;
-        --clusters_for_ip_commissioning | -c)
-            clusters=$2
-            shift
-            ;;
         --enable_pybindings | -p)
             enable_pybindings=$2
             shift
@@ -104,7 +97,7 @@ source "$CHIP_ROOT/scripts/activate.sh"
 
 chip_data_model_arg="chip_data_model=\"///examples/lighting-app/lighting-common\""
 
-gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_use_clusters_for_ip_commissioning=$clusters $chip_mdns_arg chip_controller=false $chip_data_model_arg"
+gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings $chip_mdns_arg chip_controller=false $chip_data_model_arg"
 
 # Compiles python files
 # Check pybindings was requested
diff --git a/src/controller/python/chip/server/ServerInit.cpp b/src/controller/python/chip/server/ServerInit.cpp
index c0b0d1086a66f4..a694698b6e43b0 100644
--- a/src/controller/python/chip/server/ServerInit.cpp
+++ b/src/controller/python/chip/server/ServerInit.cpp
@@ -168,9 +168,6 @@ void pychip_server_native_init()
 
     // parts from ChipLinuxAppMainLoop
 
-    uint16_t securePort   = CHIP_PORT;
-    uint16_t unsecurePort = CHIP_UDC_PORT;
-
     // Init ZCL Data Model and CHIP App Server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();