Skip to content

Commit 16a37d8

Browse files
stepanblyschakstepanblyschak
authored
[dockers] update mellanox syncd and pmon to buster (#4818)
Upgrade to libsensors5 Updated sonic-sairedis pointer: d54bfb4 [SAI] update pointer (#636) 1885a8c [syncd] Fix notification on shutdown request (#635) 9e57ba2 Fixing hostif For Genetlink host interfaces (#633) 449a092 sonic-sairedis: Add support to sonic-sairedis for gearbox phys (#632) Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
1 parent 7894576 commit 16a37d8

File tree

15 files changed

+89
-77
lines changed

15 files changed

+89
-77
lines changed

‎dockers/docker-platform-monitor/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-stretch
2+
FROM docker-config-engine-buster
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

‎platform/mellanox/docker-syncd-mlnx-rpc.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414
$(DOCKER_SYNCD_MLNX_RPC)_PYTHON_DEBS += $(MLNX_SFPD)
1515
$(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
1616
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
17-
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC)
17+
SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC)
1818
ifeq ($(ENABLE_SYNCD_RPC),y)
1919
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
2020
endif

‎platform/mellanox/docker-syncd-mlnx.mk‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,5 @@ ifeq ($(SDK_FROM_SRC), y)
1414
$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(MLNX_SDK_DBG_DEBS) $(MLNX_SAI_DBGSYM)
1515
endif
1616

17-
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
18-
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
19-
2017
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
2118
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d

‎platform/mellanox/docker-syncd-mlnx/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-stretch
2+
FROM docker-config-engine-buster
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

‎platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers‎

Submodule Switch-SDK-drivers updated 48 files

‎platform/mellanox/sdk.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
2+
MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
23
MLNX_SDK_VERSION = 4.4.0952
34
MLNX_SDK_ISSU_VERSION = 101
45

@@ -136,7 +137,7 @@ SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
136137
$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))
137138

138139
define make_path
139-
$(1)_PATH = $(MLNX_SDK_BASE_PATH)
140+
$(1)_PATH = $(MLNX_SDK_PKG_BASE_PATH)
140141

141142
endef
142143

‎rules/docker-platform-monitor.mk‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@ $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
1616
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
1717
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_DAEMON_BASE_PY2)
1818

19-
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
19+
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
2020
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LIBSWSSCOMMON_DBG) $(LIBSENSORS_DBG)
2121
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LM_SENSORS_DBG) $(SENSORD_DBG)
2222

23-
$(DOCKER_PLATFORM_MONITOR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
23+
$(DOCKER_PLATFORM_MONITOR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
2424

25-
$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH)
25+
$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BUSTER)
2626

27-
SONIC_STRETCH_DOCKERS += $(DOCKER_PLATFORM_MONITOR)
2827
SONIC_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)
2928
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)
3029

31-
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_PLATFORM_MONITOR_DBG)
3230
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG)
3331
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG)
3432

‎rules/lm-sensors.mk‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# lm-senensors package
22

3-
LM_SENSORS_VERSION=3.4.0
4-
LM_SENSORS_VERSION_FULL=$(LM_SENSORS_VERSION)-4
3+
LM_SENSORS_MAJOR_VERSION = 3
4+
LM_SENSORS_MINOR_VERSION = 5
5+
LM_SENSORS_PATCH_VERSION = 0
6+
7+
LM_SENSORS_VERSION=$(LM_SENSORS_MAJOR_VERSION).$(LM_SENSORS_MINOR_VERSION).$(LM_SENSORS_PATCH_VERSION)
8+
LM_SENSORS_VERSION_FULL=$(LM_SENSORS_VERSION)-3
59

610
LM_SENSORS = lm-sensors_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
711
$(LM_SENSORS)_SRC_PATH = $(SRC_PATH)/lm-sensors
@@ -12,10 +16,10 @@ $(eval $(call add_derived_package,$(LM_SENSORS),$(LM_SENSORS_DBG)))
1216
FANCONTROL = fancontrol_$(LM_SENSORS_VERSION_FULL)_all.deb
1317
$(eval $(call add_derived_package,$(LM_SENSORS),$(FANCONTROL)))
1418

15-
LIBSENSORS = libsensors4_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
19+
LIBSENSORS = libsensors$(LM_SENSORS_MINOR_VERSION)_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
1620
$(eval $(call add_derived_package,$(LM_SENSORS),$(LIBSENSORS)))
1721

18-
LIBSENSORS_DBG = libsensors4-dbgsym_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
22+
LIBSENSORS_DBG = libsensors$(LM_SENSORS_MINOR_VERSION)-dbgsym_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
1923
$(eval $(call add_derived_package,$(LM_SENSORS),$(LIBSENSORS_DBG)))
2024

2125
SENSORD = sensord_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb

‎sonic-slave-buster/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ RUN export VERSION=1.14.2 \
337337

338338
# For p4 build
339339
RUN pip install \
340-
ctypesgen==0.r125 \
340+
ctypesgen==1.0.2 \
341341
crc16
342342

343343
# For sonic config engine testing

‎src/lm-sensors/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*
22
!.gitignore
33
!Makefile
4+
!patch/*

0 commit comments

Comments
 (0)