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

[pmon]: fix lm-sensors binaries build (#2749)

Browse Source 
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
This commit is contained in:
Mykola F 2019-04-06 01:10:54 +03:00 committed by lguohan
parent 69ef456efd
commit 33818d6b26
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
$(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LM_SENSORS) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) $(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)

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

@ -14,8 +14,8 @@ Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
.../lm-sensors-3.4.0/debian/sensord.maintscript | 2 + .../lm-sensors-3.4.0/debian/sensord.maintscript | 2 +
.../lm-sensors-3.4.0/debian/sensord.postinst | 23 ++++++++ .../lm-sensors-3.4.0/debian/sensord.postinst | 23 ++++++++
.../lm-sensors-3.4.0/debian/sensord.substvars | 2 + .../lm-sensors-3.4.0/debian/sensord.substvars | 2 +
src/lm-sensors/lm-sensors_3.4.0-4.dsc | 3 +- .../lm-sensors-3.4.0/debian/control | 14 ++++++++++++++
10 files changed, 153 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 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.NEWS
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.README.Debian create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.README.Debian
create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.default create mode 100644 src/lm-sensors/lm-sensors-3.4.0/debian/sensord.default
@ -231,27 +231,26 @@ index 0000000..978fc8b
@@ -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-4.dsc b/src/lm-sensors/lm-sensors_3.4.0-4.dsc diff --git a/src/lm-sensors/lm-sensors-3.4.0/debian/control b/src/lm-sensors/lm-sensors-3.4.0/debian/control
index 6674f1c..2aeab21 100644 --- a/src/lm-sensors/lm-sensors-3.4.0/debian/control
--- a/src/lm-sensors/lm-sensors_3.4.0-4.dsc +++ b/src/lm-sensors/lm-sensors-3.4.0/debian/control
+++ b/src/lm-sensors/lm-sensors_3.4.0-4.dsc @@ -68,3 +68,17 @@ Description: utility to control the fan speed
@@ -3,7 +3,7 @@ Hash: SHA512 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
Format: 3.0 (quilt) normally be the case on a laptop.
Source: lm-sensors +
-Binary: lm-sensors, libsensors4, libsensors4-dev, fancontrol +Package: sensord
+Binary: lm-sensors, libsensors4, libsensors4-dev, fancontrol, sensord +Architecture: any
Architecture: any all +Section: utils
Version: 1:3.4.0-4 +Depends: lm-sensors, lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Maintainer: Aurelien Jarno <aurel32@debian.org> +Suggests: rrdtool
@@ -15,6 +15,7 @@ Package-List: +Description: hardware sensor information logging daemon
libsensors4 deb libs optional arch=any + Lm-sensors is a hardware health monitoring package for Linux. It allows you
libsensors4-dev deb libdevel extra arch=any + to access information from temperature, voltage, and fan speed sensors. It
lm-sensors deb utils extra arch=linux-any + works with most newer systems.
+ sensord deb utils extra arch=any + .
Checksums-Sha1: + This package contains a daemon that logs hardware health status to the
3e245b61a69756ea94f9c8a7c7614ec543970b8c 175802 lm-sensors_3.4.0.orig.tar.bz2 + system log with optional warnings on potential system problems.
bc5f40b504a908d825ca22da461e673dc8f7c026 26436 lm-sensors_3.4.0-4.debian.tar.xz +
-- --
1.9.1 1.9.1

6
src/lm-sensors/Makefile
View File

@ -10,12 +10,12 @@ 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_3.4.0-4.dsc dget -u http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_$(LM_SENSORS_VERSION_FULL).dsc
git am *.patch git apply *.patch
pushd lm-sensors-$(LM_SENSORS_VERSION) pushd lm-sensors-$(LM_SENSORS_VERSION)
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
mv $* $(DEST)/ mv $(DERIVED_TARGETS) $* $(DEST)/
$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET) $(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)