diff options
Diffstat (limited to 'meta-oe/recipes-bsp/lm_sensors')
3 files changed, 94 insertions, 48 deletions
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index b55bd51619..25ab44f75e 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "lm_sensors configuration files" DESCRIPTION = "Hardware health monitoring configuration files" HOMEPAGE = "http://www.lm-sensors.org/" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -17,7 +17,7 @@ S = "${WORKDIR}" PACKAGECONFIG ??= "sensord" PACKAGECONFIG[sensord] = ",," -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" do_install() { # Install fancontrol configuration file @@ -51,18 +51,18 @@ PACKAGES =+ "${PN}-fancontrol" # sensord web cgi support PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-cgi', '', d)}" -RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" -RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" -FILES_${PN}-cgi = "/www/*" +RRECOMMENDS:${PN}-cgi = "lighttpd lighttpd-module-cgi" +RDEPENDS:${PN}-cgi = "${PN}-sensord rrdtool" +FILES:${PN}-cgi = "/www/*" # libsensors configuration file -FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" +FILES:${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" # sensord logging daemon configuration files -FILES_${PN}-sensord = "\ +FILES:${PN}-sensord = "\ ${sysconfdir}/sensord.conf \ ${sysconfdir}/sysconfig/sensord \ " # fancontrol script configuration file -FILES_${PN}-fancontrol = "${sysconfdir}/fancontrol" +FILES:${PN}-fancontrol = "${sysconfdir}/fancontrol" 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 new file mode 100644 index 0000000000..c34db695ff --- /dev/null +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch @@ -0,0 +1,44 @@ +From 25f4f8793730ef3d170f1f2bd729a82fd61a4784 Mon Sep 17 00:00:00 2001 +From: puneetse <22071208+puneetse@users.noreply.github.com> +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 <Qi.Chen@windriver.com> +--- + 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_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 9c561e9f47..aba5ab5878 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Hardware health monitoring applications" HOMEPAGE = "https://hwmon.wiki.kernel.org/" -LICENSE = "GPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" @@ -10,15 +10,16 @@ DEPENDS = " \ virtual/libiconv \ " -SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ +SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=master \ file://fancontrol.init \ file://sensord.init \ + file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ " SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" inherit update-rc.d systemd -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" PACKAGECONFIG ??= "sensord" PACKAGECONFIG[sensord] = "sensord,,rrdtool" @@ -27,19 +28,19 @@ INITSCRIPT_PACKAGES = "\ ${PN}-fancontrol \ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ " -INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" -INITSCRIPT_NAME_${PN}-sensord = "sensord" -INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" -INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" +INITSCRIPT_NAME:${PN}-fancontrol = "fancontrol" +INITSCRIPT_NAME:${PN}-sensord = "sensord" +INITSCRIPT_PARAMS:${PN}-fancontrol = "defaults 66" +INITSCRIPT_PARAMS:${PN}-sensord = "defaults 67" SYSTEMD_PACKAGES = "\ ${PN} \ ${PN}-fancontrol \ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ " -SYSTEMD_SERVICE_${PN} = "lm_sensors.service" -SYSTEMD_SERVICE_${PN}-fancontrol = "fancontrol.service" -SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" +SYSTEMD_SERVICE:${PN} = "lm_sensors.service" +SYSTEMD_SERVICE:${PN}-fancontrol = "fancontrol.service" +SYSTEMD_SERVICE:${PN}-sensord = "sensord.service" SYSTEMD_AUTO_ENABLE = "disable" S = "${WORKDIR}/git" @@ -84,10 +85,10 @@ do_install() { fi } -RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" +RPROVIDES:${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += " \ +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += " \ ${PN}-libsensors \ ${PN}-sensors \ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ @@ -124,44 +125,45 @@ PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc" # libsensors files -FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" -FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" -FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" -FILES_${PN}-libsensors-doc = "${mandir}/man3" -RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" +FILES:${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" +FILES:${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" +FILES:${PN}-libsensors-staticdev = "${libdir}/libsensors.a" +FILES:${PN}-libsensors-doc = "${mandir}/man3" +RRECOMMENDS:${PN}-libsensors = "lmsensors-config-libsensors" # sensors command files -FILES_${PN}-sensors = "${bindir}/sensors" -FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" -RDEPENDS_${PN}-sensors = "${PN}-libsensors" +FILES:${PN}-sensors = "${bindir}/sensors" +FILES:${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" +RDEPENDS:${PN}-sensors = "${PN}-libsensors" # sensord logging daemon -FILES_${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" -FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" -RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" -RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" +FILES:${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" +FILES:${PN}-sensord-doc = "${mandir}/man8/sensord.8" +RDEPENDS:${PN}-sensord = "${PN}-sensors rrdtool" +RRECOMMENDS:${PN}-sensord = "lmsensors-config-sensord" # fancontrol script files -FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" -FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" -RDEPENDS_${PN}-fancontrol = "bash" -RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol" +FILES:${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" +FILES:${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" +RDEPENDS:${PN}-fancontrol = "bash" +RRECOMMENDS:${PN}-fancontrol = "lmsensors-config-fancontrol" # sensors-detect script files -FILES_${PN}-sensorsdetect = "${sbindir}/sensors-detect" -FILES_${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" -RDEPENDS_${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" +FILES:${PN}-sensorsdetect = "${sbindir}/sensors-detect" +FILES:${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" +RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-module-fcntl perl-module-file-basename \ + perl-module-strict perl-module-constant" # sensors-conf-convert script files -FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" -FILES_${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" -RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" +FILES:${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" +FILES:${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" +RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-module-strict perl-module-vars" # pwmconfig script files -FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" -FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" -RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol bash" +FILES:${PN}-pwmconfig = "${sbindir}/pwmconfig" +FILES:${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" +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}-isatools = "${sbindir}/isa*" +FILES:${PN}-isatools-doc = "${mandir}/man8/isa*" |