[gentoo-commits] repo/gentoo:master commit in: sys-apps/lm-sensors/files/
commit: 46c71991c2f1138679d74e6c8973fd2b68a30084
Author: Mike Pagano gentoo org>
AuthorDate: Thu Jun 12 15:26:39 2025 +
Commit: Mike Pagano gentoo org>
CommitDate: Thu Jun 12 15:26:39 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c71991
sys-apps/lm-sensors/files: openrc service scripts clean-up
Remove configurability of pid file
Utilize RC_SVCNAME for pidfile
Clean-up stop function
Thanks to Filip Kobierski for the collaboration
Closes: https://bugs.gentoo.org/957613
Signed-off-by: Mike Pagano gentoo.org>
sys-apps/lm-sensors/files/fancontrol.initd | 11 ++-
sys-apps/lm-sensors/files/lm_sensors.initd | 5 +
sys-apps/lm-sensors/files/sensord.initd| 14 +++---
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/sys-apps/lm-sensors/files/fancontrol.initd
b/sys-apps/lm-sensors/files/fancontrol.initd
index b8e784f68028..282f205c0c61 100644
--- a/sys-apps/lm-sensors/files/fancontrol.initd
+++ b/sys-apps/lm-sensors/files/fancontrol.initd
@@ -2,15 +2,16 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-FANCONTROL_CONFIGFILE=${FANCONTROL_CONFIGFILE:-"/etc/fancontrol"}
-FANCONTROL_SSDARGS=${FANCONTROL_SSDARGS:-"--background --wait 1000"}
-FANCONTROL_TERMTIMEOUT=${FANCONTROL_TERMTIMEOUT:-"TERM/60/KILL/5"}
+command="/usr/sbin/fancontrol"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+: ${FANCONTROL_CONFIGFILE:=/etc/fancontrol}
+: ${FANCONTROL_SSDARGS:=--background --wait 1000}
+: ${FANCONTROL_TERMTIMEOUT:=TERM/60/KILL/5}
-command="/usr/sbin/fancontrol"
command_args="${FANCONTROL_CONFIGFILE}"
start_stop_daemon_args="${FANCONTROL_SSDARGS}"
-pidfile="/run/fancontrol.pid"
retry="${FANCONTROL_TERMTIMEOUT}"
required_files="${FANCONTROL_CONFIGFILE}"
diff --git a/sys-apps/lm-sensors/files/lm_sensors.initd
b/sys-apps/lm-sensors/files/lm_sensors.initd
index 7ed503c8b0ea..562ea9585023 100644
--- a/sys-apps/lm-sensors/files/lm_sensors.initd
+++ b/sys-apps/lm-sensors/files/lm_sensors.initd
@@ -15,7 +15,4 @@ start() {
eend $?
}
-stop() {
- # Nothing to stop
- return 0;
-}
+stop(){ :; }
diff --git a/sys-apps/lm-sensors/files/sensord.initd
b/sys-apps/lm-sensors/files/sensord.initd
index fa958dbf4389..c8878ee60f0b 100644
--- a/sys-apps/lm-sensors/files/sensord.initd
+++ b/sys-apps/lm-sensors/files/sensord.initd
@@ -2,15 +2,15 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-SENSORD_PIDFILE=${SENSORD_PIDFILE:-"/run/sensord.pid"}
-SENSORD_SSDARGS=${SENSORD_SSDARGS:-"--wait 1000"}
-SENSORD_TERMTIMEOUT=${SENSORD_TERMTIMEOUT:-"TERM/60/KILL/5"}
-SENSORD_OPTS=${SENSORD_OPTS:-""}
-
command="/usr/sbin/sensord"
-command_args="${SENSORD_OPTS} --pid-file ${SENSORD_PIDFILE}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+: ${SENSORD_SSDARGS:=--wait 1000}
+: ${SENSORD_TERMTIMEOUT:=TERM/60/KILL/5}
+: ${SENSORD_OPTS:=}
+
+command_args="${SENSORD_OPTS} --pid-file ${pidfile}"
start_stop_daemon_args="${SENSORD_SSDARGS}"
-pidfile="${SENSORD_PIDFILE}"
retry="${SENSORD_TERMTIMEOUT}"
depend() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/lm-sensors/files/, sys-apps/lm-sensors/
commit: e2d9e07a3beb8f95a609c4249a491fac813ecea4
Author: Sam James gentoo org>
AuthorDate: Tue Mar 18 20:30:27 2025 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 18 20:30:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d9e07a
sys-apps/lm-sensors: don't run Valgrind tests
Signed-off-by: Sam James gentoo.org>
.../files/lm-sensors-3.6.2-no-valgrind-tests.patch | 13 +
sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.2-no-valgrind-tests.patch
b/sys-apps/lm-sensors/files/lm-sensors-3.6.2-no-valgrind-tests.patch
new file mode 100644
index ..9b0af1c2d3bb
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.6.2-no-valgrind-tests.patch
@@ -0,0 +1,13 @@
+Don't automagically run Valgrind tests. Valgrind doesn't work well in sandbox
+or on all CPUs (e.g. doesn't support AVX512 still).
+--- a/lib/test/test-scanner.pl
b/lib/test/test-scanner.pl
+@@ -48,7 +48,7 @@ my @scenarios = (
+
+ plan tests => ($#scenarios + 1) * 3;
+
+-chomp(my $valgrind = `which valgrind 2>/dev/null`);
++chomp(my $valgrind = `false`);
+
+ if ($valgrind) {
+ $test = Test::Cmd->new(prog => "$valgrind --tool=memcheck
--show-reachable=yes --leak-check=full --quiet ./test-scanner", workdir => '');
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
b/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
index d7aae5a352e7..cd520973e3e2 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
@@ -52,6 +52,7 @@ WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most
sensors."
PATCHES=(
"${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch
+ "${FILESDIR}"/${PN}-3.6.2-no-valgrind-tests.patch
)
DOCS=( CHANGES CONTRIBUTORS INSTALL README )
[gentoo-commits] repo/gentoo:master commit in: sys-apps/lm-sensors/files/, sys-apps/lm-sensors/
commit: 4fadbf60bf59c06b5cd3260a3a0aac616ebbea51
Author: Mike Pagano gentoo org>
AuthorDate: Tue Dec 24 16:55:33 2024 +
Commit: Mike Pagano gentoo org>
CommitDate: Tue Dec 24 16:55:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fadbf60
sys-apps/lm-sensors: drop 3.6.0-r1
Signed-off-by: Mike Pagano gentoo.org>
sys-apps/lm-sensors/Manifest | 1 -
.../files/lm-sensors-3.6.0-no-which.patch | 21 --
.../files/lm-sensors-3.6.0-w83627ehf-nct6775.patch | 46 -
sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild | 226 -
4 files changed, 294 deletions(-)
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 6e916a085747..ead9b15802fe 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,2 +1 @@
-DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B
d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b
SHA512
4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
DIST lm-sensors-3.6.2.tar.gz 292327 BLAKE2B
99398e951fa72857768222eed7f05ef21f547e73e31baba0a953400a594214ae572cfd65d3dd841bdbe32c96039f4350716e51aa6bcdcb9a3577d235ef3a3d37
SHA512
a89ae984814f5224bf621727252042d2b84a5cc5c125dd7024ff1be223e4c269b1e7c23512e56b3f2f38c088d7c6e54df47af51d63740deb09c44f837060695a
diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
deleted file mode 100644
index e75e23142d86..
--- a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/lm-sensors/lm-sensors/pull/402
a/Makefile
-+++ b/Makefile
-@@ -250,7 +250,7 @@ manhtml:
-
- # Flex and Bison
- %.c: %.y
-- @if ! which $(BISON) 2> /dev/null ; then \
-+ @if ! command -v $(BISON) 2> /dev/null ; then \
- echo "Please install $(BISON), then run \"make clean\" and try
again" ; \
- false ; \
- fi
-@@ -263,7 +263,7 @@ FLEX_FLAGS := -Psensors_yy -t -Cfe -8
- endif
-
- %.c: %.l
-- @if ! which $(FLEX) 2> /dev/null ; then \
-+ @if ! command -v $(FLEX) 2> /dev/null ; then \
- echo "Please install $(FLEX), then run \"make clean\" and try
again" ; \
- false ; \
- fi
diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch
b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch
deleted file mode 100644
index e4493c414a49..
--- a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 23c53b457407ab3ed217f963fc0329d0ae4bdeac Mon Sep 17 00:00:00 2001
-From: Jean Delvare
-Date: Tue, 12 May 2020 16:22:06 +0200
-Subject: [PATCH] sensors-detect: Fix the driver for Nuvoton W83677HG-I
-
-Originally, support for the Nuvoton W83677HG-I and derivatives was
-first added to the w83627ehf driver, so that's the driver recommended
-by sensors-detect. Later, support for the same device was added to
-the nct6775 driver. In kernel v5.6, support was removed from the
-w83627ehf driver to get rid of the duplicate code.
-
-So sensors-detect should now point users of this device to the
-nct6775 driver. We can't do that for very old kernels though, as this
-driver did not exist back then. I chose v3.10 for the cut-over, as
-this is when support for the Nuvoton W83677HG-I was finalized in the
-nct6775 driver, at least according to git log.
-
-Signed-off-by: Jean Delvare
- prog/detect/sensors-detect | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
-index 6fc441aa6..319b1b7b9 100755
a/prog/detect/sensors-detect
-+++ b/prog/detect/sensors-detect
-@@ -2273,7 +2273,7 @@ use constant FEAT_SMBUS => (1 << 7);
- features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- }, {
- name => "Nuvoton W83677HG-I
(NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
-- driver => "w83627ehf",
-+ driver => sub { kernel_version_at_least(3, 10, 0) ? "nct6775" :
"w83627ehf" },
- devid => 0xB470,
- devid_mask => 0xFFF0,
- logdev => 0x0b,
-@@ -4574,7 +4574,9 @@ sub scan_cpu
- sub chip_special_cases
- {
- # Some chip to driver mappings depend on the environment
-- foreach my $chip (@chip_ids) {
-+ foreach my $chip (@chip_ids, @superio_ids_natsemi, @superio_ids_smsc,
-+@superio_ids_smsc_ns, @superio_ids_winbond,
-+@superio_ids_ite) {
- if (ref($chip->{driver}) eq 'CODE') {
- $chip->{driver} = $chip->{driver}->();
- }
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
b/sys-apps/lm-sensors/lm-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/lm-sensors/files/, sys-apps/lm-sensors/
commit: 303a746c9ffce9f5940f48ffef8f1cd30ae968ee
Author: Sam James gentoo org>
AuthorDate: Mon Jun 27 09:14:55 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 27 09:27:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303a746c
sys-apps/lm-sensors: fix build w/o sys-apps/which
Signed-off-by: Sam James gentoo.org>
.../files/lm-sensors-3.6.0-no-which.patch | 21 +
sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild | 5 -
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
new file mode 100644
index ..e75e23142d86
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
@@ -0,0 +1,21 @@
+https://github.com/lm-sensors/lm-sensors/pull/402
+--- a/Makefile
b/Makefile
+@@ -250,7 +250,7 @@ manhtml:
+
+ # Flex and Bison
+ %.c: %.y
+- @if ! which $(BISON) 2> /dev/null ; then \
++ @if ! command -v $(BISON) 2> /dev/null ; then \
+ echo "Please install $(BISON), then run \"make clean\" and try
again" ; \
+ false ; \
+ fi
+@@ -263,7 +263,7 @@ FLEX_FLAGS := -Psensors_yy -t -Cfe -8
+ endif
+
+ %.c: %.l
+- @if ! which $(FLEX) 2> /dev/null ; then \
++ @if ! command -v $(FLEX) 2> /dev/null ; then \
+ echo "Please install $(FLEX), then run \"make clean\" and try
again" ; \
+ false ; \
+ fi
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index 74b209916ec0..01d6dec1eb38 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -44,7 +44,10 @@ WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for
use."
WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-PATCHES=( "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch
+ "${FILESDIR}"/${PN}-3.6.0-no-which.patch
+)
DOCS=( CHANGES CONTRIBUTORS INSTALL README )
DOCS+=(
doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
)
[gentoo-commits] repo/gentoo:master commit in: sys-apps/lm-sensors/files/, sys-apps/lm-sensors/
commit: a18593f43ed1a44bdc9d21e40c19d48f7b989bf0
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri May 7 19:58:16 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri May 7 19:58:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18593f4
sys-apps/lm-sensors: drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/lm-sensors/Manifest | 2 -
.../lm-sensors-3.4.0-sensors-detect-gentoo.patch | 342 -
sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild| 218 -
.../lm-sensors/lm-sensors-3.5.0_p20190505.ebuild | 216 -
4 files changed, 778 deletions(-)
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 029093d0d21..ae33a1f7b0c 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,3 +1 @@
-DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B
f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e
SHA512
bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
-DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B
6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2
SHA512
15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B
d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b
SHA512
4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
diff --git
a/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
b/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
deleted file mode 100644
index dd77d66c085..000
--- a/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From d8603c540cfccda5e011060083108de8f1b820ab Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann
-Date: Tue, 9 Aug 2016 01:19:16 +0200
-Subject: [PATCH 1/3] sensors-detect: Add sd_boot detection
-
-We need to know in write_config function wether the system is using systemd
-or not.
- prog/detect/sensors-detect | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
-index 057cd96..e29ab4c 100755
a/prog/detect/sensors-detect
-+++ b/prog/detect/sensors-detect
-@@ -2746,7 +2746,7 @@ sub isa_read_i5d6
- # AUTODETECTION #
- #
-
--use vars qw($dev_i2c $sysfs_root $systemd_systemctl $systemd_system_dir);
-+use vars qw($dev_i2c $sysfs_root $systemd_is_booted $systemd_systemctl
$systemd_system_dir);
-
- sub initialize_conf
- {
-@@ -2820,6 +2820,10 @@ sub initialize_conf
- } elsif (-d "/lib/systemd/system") {
- $systemd_system_dir = "/lib/systemd/system";
- }
-+
-+ # Check whether the system was booted using systemd.
-+ # See: man sd_booted
-+ $systemd_is_booted = -d '/run/systemd/system';
- }
-
- # [0] -> VERSION
---
-2.9.3
-
-
-From 14376e837c4a666fe2088bc7b7fbb90a4520f387 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann
-Date: Tue, 9 Aug 2016 01:25:52 +0200
-Subject: [PATCH 2/3] sensors-detect: write_config function adjusted for Gentoo
- environment
-
-Bug: https://bugs.gentoo.org/480018
- prog/detect/sensors-detect | 133 +
- 1 file changed, 62 insertions(+), 71 deletions(-)
-
-diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
-index e29ab4c..bb5ae0f 100755
a/prog/detect/sensors-detect
-+++ b/prog/detect/sensors-detect
-@@ -7079,6 +7079,9 @@ sub write_config
- {
- my ($configfile, $bus_modules, $hwmon_modules) = @_;
-
-+ my $have_conffiles_created = 0;
-+
-+ # /etc/modprobe.d handling
- if (defined $configfile) {
- my $have_modprobe_d = -d '/etc/modprobe.d';
- printf "Do you want to \%s /etc/modprobe.d/lm_sensors.conf?
(\%s): ",
-@@ -7087,96 +7090,84 @@ sub write_config
- $_ = read_answer();
- if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) {
- unless ($have_modprobe_d) {
-- mkdir('/etc/modprobe.d', 0777)
-+ mkdir('/etc/modprobe.d', 0755)
- or die "Sorry, can't create
/etc/modprobe.d ($!)";
- }
-- open(local *MODPROBE_D,
">/etc/modprobe.d/lm_sensors.conf")
-+ open(local *MODPROBE_D, ">", $have_modprobe_d .
'/lm_sensors.conf')
-
