Skip to content

Commit c3202d8

Browse files
authored
[build] Build/install sonic-psud as a Python wheel package (#5182)
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.
1 parent 6c89551 commit c3202d8

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ dependent_startup_wait_for=start:exited
9191

9292
{% if not skip_psud %}
9393
[program:psud]
94-
command=/usr/bin/psud
94+
command=/usr/local/bin/psud
9595
priority=7
9696
autostart=false
9797
autorestart=false

rules/docker-platform-monitor.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL)
1010
ifeq ($(CONFIGURED_PLATFORM),barefoot)
1111
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(PYTHON_THRIFT)
1212
endif
13-
$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_SYSEEPROMD) $(SONIC_THERMALCTLD) $(SONIC_PCIED)
13+
$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_XCVRD) $(SONIC_SYSEEPROMD) $(SONIC_THERMALCTLD) $(SONIC_PCIED)
1414
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
1515
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
1616
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
1717
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
1818
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_LEDD)
19+
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PSUD)
1920

2021
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
2122
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LIBSWSSCOMMON_DBG) $(LIBSENSORS_DBG)

rules/sonic-psud.dep

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
21
SPATH := $($(SONIC_PSUD)_SRC_PATH)
3-
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-psud.mk rules/sonic-psud.dep
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-psud.mk rules/sonic-psud.dep
43
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
54
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
65

7-
$(SONIC_PSUD)_CACHE_MODE := GIT_CONTENT_SHA
6+
$(SONIC_PSUD)_CACHE_MODE := GIT_CONTENT_SHA
87
$(SONIC_PSUD)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
98
$(SONIC_PSUD)_DEP_FILES := $(DEP_FILES)
109
$(SONIC_PSUD)_SMDEP_FILES := $(SMDEP_FILES)
1110
$(SONIC_PSUD)_SMDEP_PATHS := $(SPATH)
12-

rules/sonic-psud.mk

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# sonic-psud (SONiC PSU daemon) Debian package
22

3-
SONIC_PSUD = python-sonic-psud_1.0-1_all.deb
3+
SONIC_PSUD = sonic_psud-1.0-py2-none-any.whl
44
$(SONIC_PSUD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-psud
5-
$(SONIC_PSUD)_WHEEL_DEPENDS = $(SONIC_PY_COMMON_PY2)
6-
SONIC_PYTHON_STDEB_DEBS += $(SONIC_PSUD)
5+
$(SONIC_PSUD)_DEPENDS = $(SONIC_PY_COMMON_PY2)
6+
$(SONIC_PSUD)_PYTHON_VERSION = 2
7+
SONIC_PYTHON_WHEELS += $(SONIC_PSUD)

0 commit comments

Comments
 (0)