matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[dockers] update mellanox syncd and pmon to buster (#4818)

Browse Source 
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>
This commit is contained in:
Stepan Blyshchak 2020-07-18 13:46:15 +03:00 committed by GitHub
parent 78945766fc
commit 16a37d8c17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 89 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-platform-monitor/Dockerfile.j2
View File

@ -1,5 +1,5 @@
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
FROM docker-config-engine-stretch FROM docker-config-engine-buster
ARG docker_container_name ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

2
platform/mellanox/docker-syncd-mlnx-rpc.mk
View File

@ -14,7 +14,7 @@ endif
$(DOCKER_SYNCD_MLNX_RPC)_PYTHON_DEBS += $(MLNX_SFPD) $(DOCKER_SYNCD_MLNX_RPC)_PYTHON_DEBS += $(MLNX_SFPD)
$(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) $(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC) SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
endif endif

3
platform/mellanox/docker-syncd-mlnx.mk
View File

@ -14,8 +14,5 @@ ifeq ($(SDK_FROM_SRC), y)
$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(MLNX_SDK_DBG_DEBS) $(MLNX_SAI_DBGSYM) $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(MLNX_SDK_DBG_DEBS) $(MLNX_SAI_DBGSYM)
endif endif
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d

2
platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
View File

@ -1,5 +1,5 @@
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
FROM docker-config-engine-stretch FROM docker-config-engine-buster
ARG docker_container_name ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

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

@ -1 +1 @@
Subproject commit bb4c9c1c98563c3177dc8e086b8ddfe41b9695a2 Subproject commit 9dff92deb1f4cafa2e5c5077c8a6e98f0fbf586e

3
platform/mellanox/sdk.mk
View File

@ -1,4 +1,5 @@
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/ MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
MLNX_SDK_VERSION = 4.4.0952 MLNX_SDK_VERSION = 4.4.0952
MLNX_SDK_ISSU_VERSION = 101 MLNX_SDK_ISSU_VERSION = 101
@ -136,7 +137,7 @@ SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV))) $(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))
define make_path define make_path
$(1)_PATH = $(MLNX_SDK_BASE_PATH) $(1)_PATH = $(MLNX_SDK_PKG_BASE_PATH)
endef endef

8
rules/docker-platform-monitor.mk
View File

@ -16,19 +16,17 @@ $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_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_DAEMON_BASE_PY2)
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS) $(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LIBSWSSCOMMON_DBG) $(LIBSENSORS_DBG) $(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LIBSWSSCOMMON_DBG) $(LIBSENSORS_DBG)
$(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LM_SENSORS_DBG) $(SENSORD_DBG) $(DOCKER_PLATFORM_MONITOR)_DBG_DEPENDS += $(LM_SENSORS_DBG) $(SENSORD_DBG)
$(DOCKER_PLATFORM_MONITOR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES) $(DOCKER_PLATFORM_MONITOR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH) $(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BUSTER)
SONIC_STRETCH_DOCKERS += $(DOCKER_PLATFORM_MONITOR)
SONIC_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR) SONIC_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_PLATFORM_MONITOR_DBG)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG)

12
rules/lm-sensors.mk
View File

@ -1,7 +1,11 @@
# lm-senensors package # lm-senensors package
LM_SENSORS_VERSION=3.4.0 LM_SENSORS_MAJOR_VERSION = 3
LM_SENSORS_VERSION_FULL=$(LM_SENSORS_VERSION)-4 LM_SENSORS_MINOR_VERSION = 5
LM_SENSORS_PATCH_VERSION = 0
LM_SENSORS_VERSION=$(LM_SENSORS_MAJOR_VERSION).$(LM_SENSORS_MINOR_VERSION).$(LM_SENSORS_PATCH_VERSION)
LM_SENSORS_VERSION_FULL=$(LM_SENSORS_VERSION)-3
LM_SENSORS = lm-sensors_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb LM_SENSORS = lm-sensors_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(LM_SENSORS)_SRC_PATH = $(SRC_PATH)/lm-sensors $(LM_SENSORS)_SRC_PATH = $(SRC_PATH)/lm-sensors
@ -12,10 +16,10 @@ $(eval $(call add_derived_package,$(LM_SENSORS),$(LM_SENSORS_DBG)))
FANCONTROL = fancontrol_$(LM_SENSORS_VERSION_FULL)_all.deb FANCONTROL = fancontrol_$(LM_SENSORS_VERSION_FULL)_all.deb
$(eval $(call add_derived_package,$(LM_SENSORS),$(FANCONTROL))) $(eval $(call add_derived_package,$(LM_SENSORS),$(FANCONTROL)))
LIBSENSORS = libsensors4_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb LIBSENSORS = libsensors$(LM_SENSORS_MINOR_VERSION)_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LM_SENSORS),$(LIBSENSORS))) $(eval $(call add_derived_package,$(LM_SENSORS),$(LIBSENSORS)))
LIBSENSORS_DBG = libsensors4-dbgsym_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb LIBSENSORS_DBG = libsensors$(LM_SENSORS_MINOR_VERSION)-dbgsym_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LM_SENSORS),$(LIBSENSORS_DBG))) $(eval $(call add_derived_package,$(LM_SENSORS),$(LIBSENSORS_DBG)))
SENSORD = sensord_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb SENSORD = sensord_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb

2
sonic-slave-buster/Dockerfile.j2
View File

@ -337,7 +337,7 @@ RUN export VERSION=1.14.2 \
# For p4 build # For p4 build
RUN pip install \ RUN pip install \
ctypesgen==0.r125 \ ctypesgen==1.0.2 \
crc16 crc16
# For sonic config engine testing # For sonic config engine testing

1
src/lm-sensors/.gitignore vendored
View File

@ -1,3 +1,4 @@
* *
!.gitignore !.gitignore
!Makefile !Makefile
!patch/*

13
src/lm-sensors/Makefile
View File

@ -5,7 +5,7 @@ SHELL = /bin/bash
MAIN_TARGET = $(LM_SENSORS) MAIN_TARGET = $(LM_SENSORS)
DERIVED_TARGETS = fancontrol_$(LM_SENSORS_VERSION_FULL)_all.deb \ DERIVED_TARGETS = fancontrol_$(LM_SENSORS_VERSION_FULL)_all.deb \
libsensors4_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb \ $(LIBSENSORS) \
sensord_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb \ sensord_$(LM_SENSORS_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
$(LM_SENSORS_DBG) \ $(LM_SENSORS_DBG) \
$(LIBSENSORS_DBG) \ $(LIBSENSORS_DBG) \
@ -14,8 +14,17 @@ DERIVED_TARGETS = fancontrol_$(LM_SENSORS_VERSION_FULL)_all.deb \
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
rm -rf lm-sensors-$(LM_SENSORS_VERSION) rm -rf lm-sensors-$(LM_SENSORS_VERSION)
dget -u http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_$(LM_SENSORS_VERSION_FULL).dsc dget -u http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_$(LM_SENSORS_VERSION_FULL).dsc
git apply *.patch
pushd lm-sensors-$(LM_SENSORS_VERSION) pushd lm-sensors-$(LM_SENSORS_VERSION)
# Initialize as git repository
git init
git add -f *
git commit -m "unmodified lm-sensors sources"
# Apply patches
stg init
stg import -s ../patch/series
DEB_BUILD_OPTIONS=nocheck PROG_EXTRA=sensord dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) DEB_BUILD_OPTIONS=nocheck PROG_EXTRA=sensord dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd

80
src/lm-sensors/0001-patch-the-debian-package-info-to-get-sensord.patch → src/lm-sensors/patch/0001-patch-the-debian-package-info-to-get-sensord.patch
View File

@ -5,32 +5,32 @@ Subject: [PATCH] patch the debian package info to get sensord
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com> Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
--- ---
.../lm-sensors-3.4.0/debian/sensord.NEWS | 12 ++++ debian/sensord.NEWS | 12 ++++
.../lm-sensors-3.4.0/debian/sensord.README.Debian | 23 ++++++++ debian/sensord.README.Debian | 23 ++++++++
.../lm-sensors-3.4.0/debian/sensord.default | 20 +++++++ debian/sensord.default | 20 +++++++
.../lm-sensors-3.4.0/debian/sensord.dirs | 3 + debian/sensord.dirs | 3 +
.../lm-sensors-3.4.0/debian/sensord.init | 64 ++++++++++++++++++++++ debian/sensord.init | 64 ++++++++++++++++++++++
.../lm-sensors-3.4.0/debian/sensord.install | 2 + debian/sensord.install | 2 +
.../lm-sensors-3.4.0/debian/sensord.maintscript | 2 + debian/sensord.maintscript | 2 +
.../lm-sensors-3.4.0/debian/sensord.postinst | 23 ++++++++ debian/sensord.postinst | 23 ++++++++
.../lm-sensors-3.4.0/debian/sensord.substvars | 2 + debian/sensord.substvars | 2 +
.../lm-sensors-3.4.0/debian/control | 14 ++++++++++++++ debian/control | 14 ++++++++++++++
11 files changed, 167 insertions(+), 1 deletion(-) 11 files changed, 167 insertions(+), 1 deletion(-)
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.NEWS create mode 100644 /debian/sensord.NEWS
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.README.Debian create mode 100644 /debian/sensord.README.Debian
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.default create mode 100644 /debian/sensord.default
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.dirs create mode 100644 /debian/sensord.dirs
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.init create mode 100644 /debian/sensord.init
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.install create mode 100644 /debian/sensord.install
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.maintscript create mode 100644 /debian/sensord.maintscript
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.postinst create mode 100644 /debian/sensord.postinst
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.substvars create mode 100644 /debian/sensord.substvars
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.NEWS b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.NEWS diff --git a/debian/sensord.NEWS b/debian/sensord.NEWS
new file mode 100644 new file mode 100644
index 0000000..4bcfdb9 index 0000000..4bcfdb9
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.NEWS +++ b/debian/sensord.NEWS
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+lm-sensors (1:2.9.0-7) unstable; urgency=low +lm-sensors (1:2.9.0-7) unstable; urgency=low
+ +
@ -44,11 +44,11 @@ index 0000000..4bcfdb9
+ +
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 11 Jan 2005 22:41:34 +0100 + -- Aurelien Jarno <aurel32@debian.org> Tue, 11 Jan 2005 22:41:34 +0100
+ +
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.README.Debian b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.README.Debian diff --git a/debian/sensord.README.Debian b/debian/sensord.README.Debian
new file mode 100644 new file mode 100644
index 0000000..9159fbc index 0000000..9159fbc
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.README.Debian +++ b/debian/sensord.README.Debian
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+This is the Debian packaging of sensord, the sensord logging daemon. +This is the Debian packaging of sensord, the sensord logging daemon.
+ +
@ -73,11 +73,11 @@ index 0000000..9159fbc
+see /usr/share/doc/lm-sensors. +see /usr/share/doc/lm-sensors.
+ +
+-- David Z. Maze <dmaze@debian.org> +-- David Z. Maze <dmaze@debian.org>
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.default b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.default diff --git a/debian/sensord.default b/debian/sensord.default
new file mode 100644 new file mode 100644
index 0000000..589b94c index 0000000..589b94c
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.default +++ b/debian/sensord.default
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+# Interval between scanning for alarms; e.g., 30s, 1m, 1h +# Interval between scanning for alarms; e.g., 30s, 1m, 1h
+# ALARM_INTERVAL=1m +# ALARM_INTERVAL=1m
@ -99,20 +99,20 @@ index 0000000..589b94c
+# Include the load average in the RRD file. If you enable this you +# Include the load average in the RRD file. If you enable this you
+# must remove your old RRD file and rebuild your CGI script. +# must remove your old RRD file and rebuild your CGI script.
+# RRD_LOADAVG=yes +# RRD_LOADAVG=yes
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.dirs b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.dirs diff --git a/debian/sensord.dirs b/debian/sensord.dirs
new file mode 100644 new file mode 100644
index 0000000..b9cd814 index 0000000..b9cd814
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.dirs +++ b/debian/sensord.dirs
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+usr/sbin +usr/sbin
+usr/share/man/man8 +usr/share/man/man8
+etc/default +etc/default
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.init b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.init diff --git a/debian/sensord.init b/debian/sensord.init
new file mode 100644 new file mode 100644
index 0000000..4d70d43 index 0000000..4d70d43
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.init +++ b/debian/sensord.init
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -178,27 +178,27 @@ index 0000000..4d70d43
+esac +esac
+ +
+exit 0 +exit 0
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.install b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.install diff --git a/debian/sensord.install b/debian/sensord.install
new file mode 100644 new file mode 100644
index 0000000..9713fee index 0000000..9713fee
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.install +++ b/debian/sensord.install
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+usr/sbin/sensord +usr/sbin/sensord
+usr/share/man/man8/sensord.8 +usr/share/man/man8/sensord.8
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.maintscript b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.maintscript diff --git a/debian/sensord.maintscript b/debian/sensord.maintscript
new file mode 100644 new file mode 100644
index 0000000..0e0ff03 index 0000000..0e0ff03
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.maintscript +++ b/debian/sensord.maintscript
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+# Remove old logcheck ignore file +# Remove old logcheck ignore file
+rm_conffile /etc/logcheck/ignore.d.server/sensord 1:3.3.5-1~ +rm_conffile /etc/logcheck/ignore.d.server/sensord 1:3.3.5-1~
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.postinst b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.postinst diff --git a/debian/sensord.postinst b/debian/sensord.postinst
new file mode 100644 new file mode 100644
index 0000000..3418fa6 index 0000000..3418fa6
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.postinst +++ b/debian/sensord.postinst
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+#!/bin/sh +#!/bin/sh
+# postinst script for sensord +# postinst script for sensord
@ -223,17 +223,17 @@ index 0000000..3418fa6
+esac +esac
+ +
+#DEBHELPER# +#DEBHELPER#
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.substvars b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.substvars diff --git a/debian/sensord.substvars b/debian/sensord.substvars
new file mode 100644 new file mode 100644
index 0000000..978fc8b index 0000000..978fc8b
--- /dev/null --- /dev/null
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/sensord.substvars +++ b/debian/sensord.substvars
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+misc:Depends= +misc:Depends=
+misc:Pre-Depends= +misc:Pre-Depends=
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/control b/src/lm-sensors/lm-sensors-3.4.0/debian/control diff --git a/debian/control b/debian/control
--- a/src/lm-sensors/lm-sensors-3.4.0/debian/control --- a/debian/control
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/control +++ b/debian/control
@@ -68,3 +68,17 @@ Description: utility to control the fan speed @@ -68,3 +68,17 @@ Description: utility to control the fan speed
and sets the corresponding PWM outputs to the computed values. This is and sets the corresponding PWM outputs to the computed values. This is
useful when this feature is not provided by the BIOS or ACPI, which should useful when this feature is not provided by the BIOS or ACPI, which should

6
src/lm-sensors/0002-Patch-to-peform-dh_installinit-to-include-sensord.in.patch → src/lm-sensors/patch/0002-Patch-to-peform-dh_installinit-to-include-sensord.in.patch
View File

@ -9,10 +9,10 @@ Signed-off-by: Charlie Chen <charlie_chen@edge-core.com>
debian/rules | 1 + debian/rules | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/rules b/src/lm-sensors/lm-sensors-3.4.0/debian/rules diff --git a/debian/rules b/debian/rules
index 5ebda06..1d77e28 100755 index 5ebda06..1d77e28 100755
--- a/src/lm-sensors/lm-sensors-3.4.0/debian/rules --- a/debian/rules
+++ b/src/lm-sensors/lm-sensors-3.4.0/debian/rules +++ b/debian/rules
@@ -56,3 +56,4 @@ override_dh_auto_install-arch: @@ -56,3 +56,4 @@ override_dh_auto_install-arch:
override_dh_installinit-arch: override_dh_installinit-arch:

2
src/lm-sensors/patch/series Normal file
View File

@ -0,0 +1,2 @@
0001-patch-the-debian-package-info-to-get-sensord.patch
0002-Patch-to-peform-dh_installinit-to-include-sensord.in.patch

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit ccbb3bcc877cff271104ed428d9aadc4438dd73a Subproject commit d54bfb45435685059578ea53453e797b87241617