From 8b19a5c5d5879eb023d53038ca9ffca41eb94353 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Thu, 13 Aug 2020 11:26:43 -0700 Subject: [PATCH] [build] Build/install sonic-ledd as a Python wheel package (#5168) As part of migrating all Python-based package installers to wheel format rather than Debian packages. Also to allow for easily building a Python 3 version of the package in the near future. - Also remove some references to sonic-daemon-base which I previously missed and add missing sonic-py-common dependency for sonic-pcied. --- .../docker-pmon.supervisord.conf.j2 | 2 +- platform/mellanox/mlnx-platform-api.mk | 2 +- rules/docker-platform-monitor.mk | 4 ++-- rules/sonic-ledd.dep | 8 ++------ rules/sonic-ledd.mk | 7 ++++--- rules/sonic-pcied.mk | 2 +- rules/sonic-thermalctld.mk | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 index 7c1b96b2063d..4440e5fd2258 100644 --- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 +++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 @@ -65,7 +65,7 @@ dependent_startup_wait_for=start:exited {% if not skip_ledd %} [program:ledd] -command=/usr/bin/ledd +command=/usr/local/bin/ledd priority=5 autostart=false autorestart=false diff --git a/platform/mellanox/mlnx-platform-api.mk b/platform/mellanox/mlnx-platform-api.mk index c579b4539283..4abc0fda8d19 100644 --- a/platform/mellanox/mlnx-platform-api.mk +++ b/platform/mellanox/mlnx-platform-api.mk @@ -3,7 +3,7 @@ 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_DAEMON_BASE_PY2) $(SONIC_CONFIG_ENGINE) +$(SONIC_PLATFORM_API_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_CONFIG_ENGINE) SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2) export mlnx_platform_api_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2))" diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index a310b7503e92..61ceaed90c8b 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -10,12 +10,12 @@ $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) ifeq ($(CONFIGURED_PLATFORM),barefoot) $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(PYTHON_THRIFT) endif -$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_SYSEEPROMD) $(SONIC_THERMALCTLD) $(SONIC_PCIED) +$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_SYSEEPROMD) $(SONIC_THERMALCTLD) $(SONIC_PCIED) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2) -$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_DAEMON_BASE_PY2) +$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_LEDD) $(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS) $(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LIBSWSSCOMMON_DBG) $(LIBSENSORS_DBG) diff --git a/rules/sonic-ledd.dep b/rules/sonic-ledd.dep index 42e54897423a..f02163761548 100644 --- a/rules/sonic-ledd.dep +++ b/rules/sonic-ledd.dep @@ -1,14 +1,10 @@ - SPATH := $($(SONIC_LEDD)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-ledd.mk rules/sonic-ledd.dep +DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-ledd.mk rules/sonic-ledd.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files)) -$(SONIC_LEDD)_CACHE_MODE := GIT_CONTENT_SHA +$(SONIC_LEDD)_CACHE_MODE := GIT_CONTENT_SHA $(SONIC_LEDD)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SONIC_LEDD)_DEP_FILES := $(DEP_FILES) $(SONIC_LEDD)_SMDEP_FILES := $(SMDEP_FILES) $(SONIC_LEDD)_SMDEP_PATHS := $(SPATH) - - - diff --git a/rules/sonic-ledd.mk b/rules/sonic-ledd.mk index c9d66b113de2..930e8436ecaf 100644 --- a/rules/sonic-ledd.mk +++ b/rules/sonic-ledd.mk @@ -1,6 +1,7 @@ # sonic-ledd (SONiC Front-panel LED control daemon) Debian package -SONIC_LEDD = python-sonic-ledd_1.1-1_all.deb +SONIC_LEDD = sonic_ledd-1.1-py2-none-any.whl $(SONIC_LEDD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-ledd -$(SONIC_LEDD)_WHEEL_DEPENDS = $(SONIC_PY_COMMON_PY2) -SONIC_PYTHON_STDEB_DEBS += $(SONIC_LEDD) +$(SONIC_LEDD)_DEPENDS = $(SONIC_PY_COMMON_PY2) +$(SONIC_LEDD)_PYTHON_VERSION = 2 +SONIC_PYTHON_WHEELS += $(SONIC_LEDD) diff --git a/rules/sonic-pcied.mk b/rules/sonic-pcied.mk index 91796f4da54f..8cee3ababf2d 100644 --- a/rules/sonic-pcied.mk +++ b/rules/sonic-pcied.mk @@ -2,5 +2,5 @@ SONIC_PCIED = python-sonic-pcied_1.0-1_all.deb $(SONIC_PCIED)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-pcied -$(SONIC_PCIED)_WHEEL_DEPENDS = $(SONIC_DAEMON_BASE_PY2) +$(SONIC_PCIED)_WHEEL_DEPENDS = $(SONIC_PY_COMMON_PY2) SONIC_PYTHON_STDEB_DEBS += $(SONIC_PCIED) diff --git a/rules/sonic-thermalctld.mk b/rules/sonic-thermalctld.mk index cf42c2544af9..1af72c89f314 100644 --- a/rules/sonic-thermalctld.mk +++ b/rules/sonic-thermalctld.mk @@ -2,5 +2,5 @@ SONIC_THERMALCTLD = python-sonic-thermalctld_1.0-1_all.deb $(SONIC_THERMALCTLD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-thermalctld -$(SONIC_THERMALCTLD)_WHEEL_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_DAEMON_BASE_PY2) +$(SONIC_THERMALCTLD)_WHEEL_DEPENDS = $(SONIC_PY_COMMON_PY2) SONIC_PYTHON_STDEB_DEBS += $(SONIC_THERMALCTLD)