diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-bsp/lm_sensors | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-bsp/lm_sensors')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb index 454a69f40..ffab5d6bf 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb @@ -16,6 +16,14 @@ SRC_URI = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz \ SRC_URI[md5sum] = "1e9f117cbfa11be1955adc96df71eadb" SRC_URI[sha256sum] = "e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e" +# It is using '-' but not '.' as delimiter for the version in the releases page, +# which causes the version comparison unmatched. +#UPSTREAM_CHECK_URI = "https://github.com/groeck/lm-sensors/releases" + +RECIPE_UPSTREAM_VERSION = "3.4.0" +RECIPE_UPSTREAM_DATE = "Jun 25, 2015" +CHECK_DATE = "May 28, 2018" + inherit update-rc.d systemd RDEPENDS_${PN}-dev = "" @@ -68,14 +76,16 @@ do_install() { fi } +RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" + # libsensors packages -PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dbg ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" +PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" # sensors command packages -PACKAGES =+ "${PN}-sensors ${PN}-sensors-dbg ${PN}-sensors-doc" +PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc" # sensord logging daemon -PACKAGES =+ "${PN}-sensord ${PN}-sensord-dbg ${PN}-sensord-doc" +PACKAGES =+ "${PN}-sensord ${PN}-sensord-doc" # fancontrol script PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" @@ -90,11 +100,11 @@ PACKAGES =+ "${PN}-sensorsconfconvert ${PN}-sensorsconfconvert-doc" PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" # isadump and isaset helper program -PACKAGES =+ "${PN}-isatools ${PN}-isatools-dbg ${PN}-isatools-doc" +PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc" + # libsensors files FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" -FILES_${PN}-libsensors-dbg = "${libdir}/.debug ${prefix}/src/debug" FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" FILES_${PN}-libsensors-doc = "${mandir}/man3" @@ -102,13 +112,11 @@ RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" # sensors command files FILES_${PN}-sensors = "${bindir}/sensors" -FILES_${PN}-sensors-dbg = "${bindir}/.debug/sensors" FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" RDEPENDS_${PN}-sensors = "${PN}-libsensors" # sensord logging daemon FILES_${PN}-sensord = "${sbindir}/sensord ${sysconfdir}/init.d/sensord ${systemd_unitdir}/system/sensord.service" -FILES_${PN}-sensord-dbg = "${bindir}/.debug/sensord" FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" @@ -136,5 +144,4 @@ RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol" # isadump and isaset helper program files FILES_${PN}-isatools = "${sbindir}/isa*" -FILES_${PN}-isatools-dbg = "${sbindir}/.debug/isa*" FILES_${PN}-isatools-doc = "${mandir}/man8/isa*" |