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

Revert "[Mellanox] update hw-mgmt package to V.7.0010.1300 (#5363)" (#5371)

Browse Source 
This reverts commit 940de61ffc.
This commit is contained in:
Qi Luo 2020-09-16 10:38:21 -07:00 committed by GitHub
parent 35de31b741
commit f494ff1890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/mellanox/hw-management.mk
View File

@ -1,6 +1,6 @@
# Mellanox HW Management # Mellanox HW Management
MLNX_HW_MANAGEMENT_VERSION = 7.0010.1300 MLNX_HW_MANAGEMENT_VERSION = 7.0010.1000
export MLNX_HW_MANAGEMENT_VERSION export MLNX_HW_MANAGEMENT_VERSION

28
platform/mellanox/hw-management/0001-Disable-hw-management-thermal-control-shell-script.patch Normal file
View File

@ -0,0 +1,28 @@
From 3bce9e33132a86c0a53a7b0a49ee1932d65bfb7f Mon Sep 17 00:00:00 2001
From: junchao <junchao@mellanox.com>
Date: Wed, 6 May 2020 11:37:56 +0800
Subject: [PATCH] Disable hw-management thermal control shell script
---
usr/usr/bin/hw-management.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
index 65e5d39..cffff7a 100755
--- a/usr/usr/bin/hw-management.sh
+++ b/usr/usr/bin/hw-management.sh
@@ -832,7 +832,10 @@ do_start()
if [ -f $config_path/max_tachos ]; then
max_tachos=$(<$config_path/max_tachos)
fi
- $THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
+
+ # Disable thermal control shell script in hw-management
+ # because there has already been that in SONiC
+ # $THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
}
do_stop()
--
1.9.1

2
platform/mellanox/hw-management/hw-mgmt

@ -1 +1 @@
Subproject commit dec7935777b52d31a2220bad8b0cec4b71ec0961 Subproject commit cdacf1e932f929c8dedde6c7e14759a2083aac66