From: Ankur Tyagi <[email protected]>
License-Update: content unchanged aside from formatting[1]
- Add tag in the SRC_URI
- Add zsh-completion package
- Drop patches which are part of the upstream version
Changelog:
https://github.com/lm-sensors/lm-sensors/blob/V3-6-2/CHANGES
[1] https://github.com/lm-sensors/lm-sensors/commit/6128b9e8eb58d6a12d4c8a8d6a635a3f066a0127
Signed-off-by: Ankur Tyagi <[email protected]>
---
...nge-PIDFile-path-from-var-run-to-run.patch | 44 -------------------
.../0001-Fix-building-with-GCC-14.patch | 36 ---------------
...{lmsensors_3.6.0.bb => lmsensors_3.6.2.bb} | 12 ++---
3 files changed, 7 insertions(+), 85 deletions(-)
delete mode 100644 meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch
delete mode 100644 meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
rename meta-oe/recipes-bsp/lm_sensors/{lmsensors_3.6.0.bb => lmsensors_3.6.2.bb} (95%)
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch
deleted file mode 100644
index c34db695ff..0000000000
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 25f4f8793730ef3d170f1f2bd729a82fd61a4784 Mon Sep 17 00:00:00 2001
-From: puneetse <[email protected]>
-Date: Wed, 11 Mar 2020 09:36:51 -0700
-Subject: [PATCH] Change PIDFile path from /var/run to /run
-
-/var/run is considered a legacy directory by systemd 239+ and having it in unit files causes a warning to be emitted to the journal.
-
-Upstream-Status: Backport [25f4f8793730ef3d170f1f2bd729a82fd61a4784]
-
-Signed-off-by: Chen Qi <[email protected]>
----
- prog/init/fancontrol.service | 2 +-
- prog/init/sensord.service | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/prog/init/fancontrol.service b/prog/init/fancontrol.service
-index 3ac1ed02..43293141 100644
---- a/prog/init/fancontrol.service
-+++ b/prog/init/fancontrol.service
-@@ -5,7 +5,7 @@ After=lm_sensors.service
-
- [Service]
- Type=simple
--PIDFile=/var/run/fancontrol.pid
-+PIDFile=/run/fancontrol.pid
- ExecStart=/usr/sbin/fancontrol
-
- [Install]
-diff --git a/prog/init/sensord.service b/prog/init/sensord.service
-index 2448beeb..af2f0ae9 100644
---- a/prog/init/sensord.service
-+++ b/prog/init/sensord.service
-@@ -5,7 +5,7 @@ After=lm_sensors.service
- [Service]
- EnvironmentFile=/etc/sysconfig/sensord
- Type=forking
--PIDFile=/var/run/sensord.pid
-+PIDFile=/run/sensord.pid
- ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon
-
- [Install]
---
-2.17.1
-
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
deleted file mode 100644
index 0ff8b3801b..0000000000
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <[email protected]>
-Date: Fri, 24 May 2024 14:16:21 +0300
-Subject: [PATCH] Fix building with GCC 14
-
-Signed-off-by: Dmitry Baryshkov <[email protected]>
-Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497]
----
- prog/sensord/rrd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
-index a531362bddd5..36d685fce514 100644
---- a/prog/sensord/rrd.c
-+++ b/prog/sensord/rrd.c
-@@ -299,7 +299,7 @@ int rrdInit(void)
- argv[argc++] = rraBuff;
- argv[argc] = NULL;
-
-- ret = rrd_create(argc, (char**) argv);
-+ ret = rrd_create(argc, (const char**) argv);
- if (ret == -1) {
- sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
- sensord_args.rrdFile, rrd_get_error());
-@@ -455,7 +455,7 @@ int rrdUpdate(void)
- const char *argv[] = {
- "sensord", sensord_args.rrdFile, rrdBuff, NULL
- };
-- if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
-+ if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
- sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
- sensord_args.rrdFile, rrd_get_error());
- }
---
-2.39.2
-
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.2.bb
similarity index 95%
rename from meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
rename to meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.2.bb
index 149c68a455..afbfb6d4f2 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.2.bb
@@ -1,7 +1,7 @@
SUMMARY = "Hardware health monitoring applications"
HOMEPAGE = "https://hwmon.wiki.kernel.org/"
LICENSE = "GPL-2.0-or-later AND LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = " \
@@ -10,13 +10,12 @@ DEPENDS = " \
virtual/libiconv \
"
-SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=master \
+UPSTREAM_TAG = "V${@d.getVar('PV').replace('.', '-')}"
+SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=master;tag=${UPSTREAM_TAG} \
file://fancontrol.init \
file://sensord.init \
- file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
- file://0001-Fix-building-with-GCC-14.patch \
"
-SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
+SRCREV = "5c3ba50f806dea27c3b1e368966191c735459111"
# Upstream release tags look like "V3-6-2". The checker only converts "_" to
# "." (not "-"), so the parsed version stays dash-separated and cannot be
# compared against the dotted PV; marked unknown until that can resolve.
@@ -128,6 +127,7 @@ PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc"
# isadump and isaset helper program
PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc"
+PACKAGES =+ "${PN}-zsh-completion"
# libsensors files
FILES:${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d"
@@ -172,3 +172,5 @@ RDEPENDS:${PN}-pwmconfig = "${PN}-fancontrol bash"
# isadump and isaset helper program files
FILES:${PN}-isatools = "${sbindir}/isa*"
FILES:${PN}-isatools-doc = "${mandir}/man8/isa*"
+
+FILES:${PN}-zsh-completion = "${datadir}/zsh"
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.