From 0b8e463db4b9518384dbeebba96af0f8731ffdf2 Mon Sep 17 00:00:00 2001 From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com> Date: Sat, 4 Jun 2022 07:41:15 -0700 Subject: [PATCH] [sonic-platform-common][sonic-platform-daemons] submodule update; Remove python2 sonic-platform-common wheel (#10994) * [sonic-platform-common][sonic-platform-daemons] submodule update vdahiya@vdahiya-dev3:~/sonic-buildimage8/sonic-buildimage/src/sonic-platform-daemons$ git log --oneline 9ac12bf..master 0d90023 (HEAD -> master, origin/master, origin/HEAD, origin/202205) grpc client implementation for active-active dualtor (#248) 6b8bf69 [ycabled] Fix some syntax warnings in ycabled (#263) 2bcf936 [ycabled] fix the posting for mux_cable_static_info per downlink when ycabled is spawned; synchronizing executing Telemetry API (#257) ce217c0 Include changes from xcvr_api in transceiver_info table (#253) e0f8a35 Fix checkReplyType failed issue via recreating xcvr_table_helper on forking subprocess (#255) f575a40 (origin/master, origin/HEAD, origin/202205, master) [Credo][Ycable] changes for synchronizing executing Telemetry API's when mux toggle is inprogress (#280) b043372 [sonic_ssd] Nokia-7215: "show platform ssdhealth" not showing health percent (#279) d62d3d6 [CMIS]Fix low-power to high power mode transition (#268) f918125 [syseeprom] Enable display of vendor extension TLV content (#270) 4e08440 [Credo][Ycable] improve logging for Server Powered off/Faulty cables (#272) Signed-off-by: vaibhav-dahiya * remove python2 wheel for sonic-platform-common Signed-off-by: vaibhav-dahiya * remove python2 platform_common definitions Signed-off-by: vaibhav-dahiya --- platform/mellanox/mlnx-platform-api.mk | 11 ----------- rules/sonic-platform-common.dep | 8 -------- rules/sonic-platform-common.mk | 15 --------------- slave.mk | 2 -- src/sonic-platform-common | 2 +- src/sonic-platform-daemons | 2 +- 6 files changed, 2 insertions(+), 38 deletions(-) diff --git a/platform/mellanox/mlnx-platform-api.mk b/platform/mellanox/mlnx-platform-api.mk index 496f393caa..ecd8b8532e 100644 --- a/platform/mellanox/mlnx-platform-api.mk +++ b/platform/mellanox/mlnx-platform-api.mk @@ -14,17 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# SONIC_PLATFORM_API_PY2 package - -ifeq ($(ENABLE_PY2_MODULES), y) - SONIC_PLATFORM_API_PY2 = mlnx_platform_api-1.0-py2-none-any.whl - $(SONIC_PLATFORM_API_PY2)_SRC_PATH = $(PLATFORM_PATH)/mlnx-platform-api - $(SONIC_PLATFORM_API_PY2)_PYTHON_VERSION = 2 - $(SONIC_PLATFORM_API_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_CONFIG_ENGINE_PY2) - SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2) -endif - -export mlnx_platform_api_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2))" # SONIC_PLATFORM_API_PY3 package diff --git a/rules/sonic-platform-common.dep b/rules/sonic-platform-common.dep index 632c92c1ac..e65222869c 100644 --- a/rules/sonic-platform-common.dep +++ b/rules/sonic-platform-common.dep @@ -4,14 +4,6 @@ DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-platform-common.mk rules/s DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "^sonic_sfp|^sonic_eeprom")) -ifeq ($(ENABLE_PY2_MODULES), y) - $(SONIC_PLATFORM_COMMON_PY2)_CACHE_MODE := GIT_CONTENT_SHA - $(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) - $(SONIC_PLATFORM_COMMON_PY2)_DEP_FILES := $(DEP_FILES) - $(SONIC_PLATFORM_COMMON_PY2)_SMDEP_FILES := $(SMDEP_FILES) - $(SONIC_PLATFORM_COMMON_PY2)_SMDEP_PATHS := $(SPATH) -endif - $(SONIC_PLATFORM_COMMON_PY3)_CACHE_MODE := GIT_CONTENT_SHA $(SONIC_PLATFORM_COMMON_PY3)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) diff --git a/rules/sonic-platform-common.mk b/rules/sonic-platform-common.mk index 09ce14faab..bd5f14eaf9 100644 --- a/rules/sonic-platform-common.mk +++ b/rules/sonic-platform-common.mk @@ -1,22 +1,7 @@ -ifeq ($(ENABLE_PY2_MODULES), y) - # sonic-platform-common package - - SONIC_PLATFORM_COMMON_PY2 = sonic_platform_common-1.0-py2-none-any.whl - $(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-common - $(SONIC_PLATFORM_COMMON_PY2)_PYTHON_VERSION = 2 - $(SONIC_PLATFORM_COMMON_PY2)_DEPENDS += $(SONIC_PY_COMMON_PY2) $(SONIC_CONFIG_ENGINE_PY2) - $(SONIC_PLATFORM_COMMON_PY2)_DEBS_DEPENDS += $(PYTHON_SWSSCOMMON) - SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) -endif - # Als build sonic-platform-common into python3 wheel, so we can use PSU code in SNMP docker SONIC_PLATFORM_COMMON_PY3 = sonic_platform_common-1.0-py3-none-any.whl $(SONIC_PLATFORM_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-common $(SONIC_PLATFORM_COMMON_PY3)_PYTHON_VERSION = 3 $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_CONFIG_ENGINE_PY3) $(SONIC_PLATFORM_COMMON_PY3)_DEBS_DEPENDS += $(PYTHON3_SWSSCOMMON) -ifeq ($(ENABLE_PY2_MODULES), y) - # Synthetic dependency just to avoid race condition - $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PLATFORM_COMMON_PY2) -endif SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) diff --git a/slave.mk b/slave.mk index c092ea0d27..0924eab54d 100644 --- a/slave.mk +++ b/slave.mk @@ -1065,7 +1065,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PY_COMMON_PY3)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE_PY2)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE_PY3)) \ - $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY3)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY2)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2)) \ @@ -1135,7 +1134,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ export config_engine_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE_PY3))" export swsssdk_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY2))" export swsssdk_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY3))" - export platform_common_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))" export platform_common_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY3))" export redis_dump_load_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY2))" export redis_dump_load_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY3))" diff --git a/src/sonic-platform-common b/src/sonic-platform-common index b70e75979f..f575a401b8 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit b70e75979f704e980a3fb20732642ec99f32b0ee +Subproject commit f575a401b83bbd5d6b6d68824ff22eae8647be16 diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 9ac12bfb40..0d90023b4a 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 9ac12bfb406416b0fb3b03a084d8179bdc53f3a6 +Subproject commit 0d90023b4ae973bd2fa01381d4d1ba4992b45025