- Update from 3-4-0 to 3-6-0 - Update of rootfilers in each architecture Only the library version changed in each rootfile - Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire. - Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/aarch64/lm_sensors | 4 ++-- config/rootfiles/common/armv5tel/lm_sensors | 4 ++-- config/rootfiles/common/i586/lm_sensors | 4 ++-- config/rootfiles/common/x86_64/lm_sensors | 4 ++-- lfs/lm_sensors | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP)
- Patch to remove checks for SENSORS_API_VERSION upper limit Patch based on one by Pavel Rochnyack https://git.ipfire.org/?p=thirdparty/collectd.git;a=commitdiff;h=d5a3c020%3E - Without this patch collectd fails to build with the updated lm_sensors version (3-6-0) due to a problem with the version of libsensors used by lm_sensors
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/collectd | 1 + ...-for-SENSORS_API_VERSION-upper-limit.patch | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch
diff --git a/lfs/collectd b/lfs/collectd index 7c9744531..36b507868 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -106,6 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch b/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch new file mode 100644 index 000000000..ae3cc4c7d --- /dev/null +++ b/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch @@ -0,0 +1,63 @@ +Based on patch from Pavel Rochnyack +https://git.ipfire.org/?p=thirdparty/collectd.git;a=commitdiff;h=d5a3c020d33... + +diff -Naur collectd-4.10.9/src/sensors.c.orig collectd-4.10.9/src/sensors.c +--- collectd-4.10.9/src/sensors.c.orig 2013-04-08 08:26:17.000000000 +0200 ++++ collectd-4.10.9/src/sensors.c 2021-04-13 23:17:43.196069346 +0200 +@@ -150,7 +150,7 @@ + # endif + /* #endif SENSORS_API_VERSION < 0x400 */ + +-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) ++#elif (SENSORS_API_VERSION >= 0x400) + typedef struct featurelist + { + const sensors_chip_name *chip; +@@ -162,11 +162,7 @@ + # ifndef SENSORS_CONF_PATH + # define SENSORS_CONF_PATH "/etc/sensors3.conf" + # endif +-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ + +-#else /* if SENSORS_API_VERSION >= 0x500 */ +-# error "This version of libsensors is not supported yet. Please report this " \ +- "as bug." + #endif + + static const char *conffile = SENSORS_CONF_PATH; +@@ -394,7 +390,7 @@ + } /* while sensors_get_detected_chips */ + /* #endif SENSORS_API_VERSION < 0x400 */ + +-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) ++#elif (SENSORS_API_VERSION >= 0x400) + chip_num = 0; + while ((chip = sensors_get_detected_chips (NULL, &chip_num)) != NULL) + { +@@ -448,7 +444,7 @@ + } /* while (subfeature) */ + } /* while (feature) */ + } /* while (chip) */ +-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ ++#endif /* (SENSORS_API_VERSION >= 0x400) */ + + if (first_feature == NULL) + { +@@ -541,7 +537,7 @@ + } /* for fl = first_feature .. NULL */ + /* #endif SENSORS_API_VERSION < 0x400 */ + +-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) ++#elif (SENSORS_API_VERSION >= 0x400) + for (fl = first_feature; fl != NULL; fl = fl->next) + { + double value; +@@ -576,7 +572,7 @@ + + sensors_submit (plugin_instance, type, type_instance, value); + } /* for fl = first_feature .. NULL */ +-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ ++#endif /* (SENSORS_API_VERSION >= 0x400) */ + + return (0); + } /* int sensors_read */
Hello,
There was another sobump in this package and netsnmpd was linking against it.
I incremented the release number of that package, too.
Best, -Michael
On 14 Apr 2021, at 12:57, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 3-4-0 to 3-6-0
- Update of rootfilers in each architecture Only the library version changed in each rootfile
- Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire.
- Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/aarch64/lm_sensors | 4 ++-- config/rootfiles/common/armv5tel/lm_sensors | 4 ++-- config/rootfiles/common/i586/lm_sensors | 4 ++-- config/rootfiles/common/x86_64/lm_sensors | 4 ++-- lfs/lm_sensors | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP)
-- 2.31.1
Hi Michael,
On 14/04/2021 19:48, Michael Tremer wrote:
Hello,
There was another sobump in this package and netsnmpd was linking against it.
I incremented the release number of that package, too.
Ah, so if a shared object library is changed in the rootfiles by an update I should run the find-dependencies step to see if there are any other addon programs linked to it, in which case I need to increment the PAK_VER number of that package as well and submit as a patch.
Just to confirm that is only if another addon is flagged. What if a common program is flagged, how do I deal with that because they don't have a PAK_VER to increment?
Regards, Adolf
Best, -Michael
On 14 Apr 2021, at 12:57, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 3-4-0 to 3-6-0
- Update of rootfilers in each architecture Only the library version changed in each rootfile
- Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire.
- Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/aarch64/lm_sensors | 4 ++-- config/rootfiles/common/armv5tel/lm_sensors | 4 ++-- config/rootfiles/common/i586/lm_sensors | 4 ++-- config/rootfiles/common/x86_64/lm_sensors | 4 ++-- lfs/lm_sensors | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP)
-- 2.31.1
Hello,
On 14 Apr 2021, at 21:02, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 14/04/2021 19:48, Michael Tremer wrote:
Hello, There was another sobump in this package and netsnmpd was linking against it. I incremented the release number of that package, too.
Ah, so if a shared object library is changed in the rootfiles by an update I should run the find-dependencies step to see if there are any other addon programs linked to it, in which case I need to increment the PAK_VER number of that package as well and submit as a patch.
Not always, but sometimes :)
Every binary has a lost of libraries that it needs. Those are what we call “dependencies”. You can see them by using “readelf -d” (the NEEDED lines):
root@michael:/build/ipfire-2.x# readelf -d /bin/bash Dynamic section at offset 0x113cf0 contains 28 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libtinfo.so.6] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] 0x000000000000000c (INIT) 0x2d000 0x000000000000000d (FINI) 0xda784 0x0000000000000019 (INIT_ARRAY) 0x1123f0
But instead of listing "libtinfo.so.6.1”, only the first number is included.
That is so that you can update a library if bugs have been fixed and give it a new version (libtinfo.so.6.2, libtinfo.so.6.3, libtinfo.so.6.4, …) and avoid recompiling all programs. Most of the time, nothing important changes, only what a function does might be slightly changed, which is not really relevant to “bash” in this case.
The runtime linker is now looking for “libtinfo.so.6” which is a symlink to libtinfo.so.6.1.
If libtinfo.so.6 disappears because an update to libtinfo.so.7 would be installed, bash will no longer function because the runtime linker does not find all needed libraries.
That is why we need to find all files that are linked against a library if we move from .6 to .7, but not when we move from .6.1 to .6.2.
I hope this makes sense :)
Just to confirm that is only if another addon is flagged. What if a common program is flagged, how do I deal with that because they don't have a PAK_VER to increment?
Then we would need to ship those programs by linking the root files into the core update.
-Michael
Regards, Adolf
Best, -Michael
On 14 Apr 2021, at 12:57, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 3-4-0 to 3-6-0
- Update of rootfilers in each architecture Only the library version changed in each rootfile
- Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire.
- Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/aarch64/lm_sensors | 4 ++-- config/rootfiles/common/armv5tel/lm_sensors | 4 ++-- config/rootfiles/common/i586/lm_sensors | 4 ++-- config/rootfiles/common/x86_64/lm_sensors | 4 ++-- lfs/lm_sensors | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP)
-- 2.31.1
Hi Michael,
On 15/04/2021 12:36, Michael Tremer wrote:
Hello,
On 14 Apr 2021, at 21:02, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 14/04/2021 19:48, Michael Tremer wrote:
Hello, There was another sobump in this package and netsnmpd was linking against it. I incremented the release number of that package, too.
Ah, so if a shared object library is changed in the rootfiles by an update I should run the find-dependencies step to see if there are any other addon programs linked to it, in which case I need to increment the PAK_VER number of that package as well and submit as a patch.
Not always, but sometimes :)
Every binary has a lost of libraries that it needs. Those are what we call “dependencies”. You can see them by using “readelf -d” (the NEEDED lines):
root@michael:/build/ipfire-2.x# readelf -d /bin/bash Dynamic section at offset 0x113cf0 contains 28 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libtinfo.so.6] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] 0x000000000000000c (INIT) 0x2d000 0x000000000000000d (FINI) 0xda784 0x0000000000000019 (INIT_ARRAY) 0x1123f0
But instead of listing "libtinfo.so.6.1”, only the first number is included.
That is so that you can update a library if bugs have been fixed and give it a new version (libtinfo.so.6.2, libtinfo.so.6.3, libtinfo.so.6.4, …) and avoid recompiling all programs. Most of the time, nothing important changes, only what a function does might be slightly changed, which is not really relevant to “bash” in this case.
The runtime linker is now looking for “libtinfo.so.6” which is a symlink to libtinfo.so.6.1.
If libtinfo.so.6 disappears because an update to libtinfo.so.7 would be installed, bash will no longer function because the runtime linker does not find all needed libraries.
That is why we need to find all files that are linked against a library if we move from .6 to .7, but not when we move from .6.1 to .6.2.
I hope this makes sense :)
Absolutely. Thanks for the explanation. It makes sense to me now. Also why there are so.x and so.x.y library files and the way they are symlinked. That now makes sense to me.
Always something new to learn. Thanks very much
Adolf.
Just to confirm that is only if another addon is flagged. What if a common program is flagged, how do I deal with that because they don't have a PAK_VER to increment?
Then we would need to ship those programs by linking the root files into the core update.
-Michael
Regards, Adolf
Best, -Michael
On 14 Apr 2021, at 12:57, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 3-4-0 to 3-6-0
- Update of rootfilers in each architecture Only the library version changed in each rootfile
- Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire.
- Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/aarch64/lm_sensors | 4 ++-- config/rootfiles/common/armv5tel/lm_sensors | 4 ++-- config/rootfiles/common/i586/lm_sensors | 4 ++-- config/rootfiles/common/x86_64/lm_sensors | 4 ++-- lfs/lm_sensors | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP)
-- 2.31.1
On 15 Apr 2021, at 12:42, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 15/04/2021 12:36, Michael Tremer wrote:
Hello,
On 14 Apr 2021, at 21:02, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 14/04/2021 19:48, Michael Tremer wrote:
Hello, There was another sobump in this package and netsnmpd was linking against it. I incremented the release number of that package, too.
Ah, so if a shared object library is changed in the rootfiles by an update I should run the find-dependencies step to see if there are any other addon programs linked to it, in which case I need to increment the PAK_VER number of that package as well and submit as a patch.
Not always, but sometimes :) Every binary has a lost of libraries that it needs. Those are what we call “dependencies”. You can see them by using “readelf -d” (the NEEDED lines): root@michael:/build/ipfire-2.x# readelf -d /bin/bash Dynamic section at offset 0x113cf0 contains 28 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libtinfo.so.6] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] 0x000000000000000c (INIT) 0x2d000 0x000000000000000d (FINI) 0xda784 0x0000000000000019 (INIT_ARRAY) 0x1123f0 But instead of listing "libtinfo.so.6.1”, only the first number is included. That is so that you can update a library if bugs have been fixed and give it a new version (libtinfo.so.6.2, libtinfo.so.6.3, libtinfo.so.6.4, …) and avoid recompiling all programs. Most of the time, nothing important changes, only what a function does might be slightly changed, which is not really relevant to “bash” in this case. The runtime linker is now looking for “libtinfo.so.6” which is a symlink to libtinfo.so.6.1. If libtinfo.so.6 disappears because an update to libtinfo.so.7 would be installed, bash will no longer function because the runtime linker does not find all needed libraries. That is why we need to find all files that are linked against a library if we move from .6 to .7, but not when we move from .6.1 to .6.2. I hope this makes sense :)
Absolutely. Thanks for the explanation. It makes sense to me now. Also why there are so.x and so.x.y library files and the way they are symlinked. That now makes sense to me.
Always something new to learn. Thanks very much
Happy to help :)
Adolf.
Just to confirm that is only if another addon is flagged. What if a common program is flagged, how do I deal with that because they don't have a PAK_VER to increment?
Then we would need to ship those programs by linking the root files into the core update. -Michael
Regards, Adolf
Best, -Michael
On 14 Apr 2021, at 12:57, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 3-4-0 to 3-6-0
- Update of rootfilers in each architecture Only the library version changed in each rootfile
- Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire.
- Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/aarch64/lm_sensors | 4 ++-- config/rootfiles/common/armv5tel/lm_sensors | 4 ++-- config/rootfiles/common/i586/lm_sensors | 4 ++-- config/rootfiles/common/x86_64/lm_sensors | 4 ++-- lfs/lm_sensors | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP)
-- 2.31.1
-- Sent from my laptop
-
Adolf Belka -
Michael Tremer