From 3c4b4cdb67090a44d9d53f591531b81ea4c38591 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Mar 2013 06:42:58 +0000 Subject: lmsensors: Upgrade 3.3.2 -> lmsensors_3.3.3 Fix build with mutlilib enabled architectures when we have libdir != /usr/lib it always would not package libsensors.* since they will get installed into /usr/lib and ignored. So define LIBDIR properly Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../recipes-support/lm_sensors/lmsensors_3.3.2.bb | 122 --------------------- .../recipes-support/lm_sensors/lmsensors_3.3.3.bb | 120 ++++++++++++++++++++ 2 files changed, 120 insertions(+), 122 deletions(-) delete mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb deleted file mode 100644 index 1a1ef2dfda..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb +++ /dev/null @@ -1,122 +0,0 @@ -SUMMARY = "lm_sensors" -DESCRIPTION = "Hardware health monitoring applications" -HOMEPAGE = "http://www.lm-sensors.org/" -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "sysfsutils virtual/libiconv bison-native flex-native rrdtool" - -SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.bz2 \ - file://fancontrol.init \ - file://sensord.init \ -" - -SRC_URI[md5sum] = "f357ba00b080ab102a170f7bf8bb2578" -SRC_URI[sha256sum] = "f13dd885406841a7352ccfb8b9ccb23c4c057abe3de4258da5444c149a9e3ae1" - -PR = "r1" - -inherit update-rc.d - -INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord" -INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" -INITSCRIPT_NAME_${PN}-sensord = "sensord" -INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" -INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" - -S = "${WORKDIR}/lm_sensors-${PV}" - -EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \ - MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ - CC="${CC}" AR="${AR}"' - -do_compile() { - oe_runmake user PROG_EXTRA="sensors sensord" -} - -do_install() { - oe_runmake user_install DESTDIR=${D} - install -m 0755 ${S}/prog/sensord/sensord ${D}${bindir} - install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 - - # Install directory - install -d ${D}${sysconfdir}/init.d - - # Install fancontrol init script - install -m 0755 ${WORKDIR}/fancontrol.init \ - ${D}${sysconfdir}/init.d/fancontrol - - # Install sensord init script - install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord -} - -# libsensors packages -PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dbg ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" - -# sensors command packages -PACKAGES =+ "${PN}-sensors ${PN}-sensors-dbg ${PN}-sensors-doc" - -# sensord logging daemon -PACKAGES =+ "${PN}-sensord ${PN}-sensord-dbg ${PN}-sensord-doc" - -# fancontrol script -PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" - -# sensors-detect script -PACKAGES =+ "${PN}-sensorsdetect ${PN}-sensorsdetect-doc" - -# sensors-conf-convert script -PACKAGES =+ "${PN}-sensorsconfconvert" - -# pwmconfig script -PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" - -# isadump and isaset helper program -PACKAGES =+ "${PN}-isatools ${PN}-isatools-dbg ${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" -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 = "${bindir}/sensord ${sysconfdir}/init.d/sensord" -FILES_${PN}-sensord-dbg = "${bindir}/.debug/sensord" -FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" -RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool lighttpd lighttpd-module-cgi" -RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" - -# fancontrol script files -FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${sysconfdir}/init.d/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" - -# sensors-conf-convert script files -FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" -RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" - -# pwmconfig script files -FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" -FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" -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*" diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb new file mode 100644 index 0000000000..4f15535248 --- /dev/null +++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb @@ -0,0 +1,120 @@ +SUMMARY = "lm_sensors" +DESCRIPTION = "Hardware health monitoring applications" +HOMEPAGE = "http://www.lm-sensors.org/" +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "sysfsutils virtual/libiconv bison-native flex-native rrdtool" + +SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.bz2 \ + file://fancontrol.init \ + file://sensord.init \ +" +SRC_URI[md5sum] = "73c2fcccdab6049d289c5e0c596192a1" +SRC_URI[sha256sum] = "ecc91ba3d918e96fb7d5eb9acce978af803b130e0b33b08d5ea05b2bfca84955" + +inherit update-rc.d + +INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord" +INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" +INITSCRIPT_NAME_${PN}-sensord = "sensord" +INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" +INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" + +S = "${WORKDIR}/lm_sensors-${PV}" + +EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \ + MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ + LIBDIR=${libdir} \ + CC="${CC}" AR="${AR}"' + +do_compile() { + oe_runmake user PROG_EXTRA="sensors sensord" +} + +do_install() { + oe_runmake user_install DESTDIR=${D} + install -m 0755 ${S}/prog/sensord/sensord ${D}${bindir} + install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 + + # Install directory + install -d ${D}${sysconfdir}/init.d + + # Install fancontrol init script + install -m 0755 ${WORKDIR}/fancontrol.init \ + ${D}${sysconfdir}/init.d/fancontrol + + # Install sensord init script + install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord +} + +# libsensors packages +PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dbg ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" + +# sensors command packages +PACKAGES =+ "${PN}-sensors ${PN}-sensors-dbg ${PN}-sensors-doc" + +# sensord logging daemon +PACKAGES =+ "${PN}-sensord ${PN}-sensord-dbg ${PN}-sensord-doc" + +# fancontrol script +PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" + +# sensors-detect script +PACKAGES =+ "${PN}-sensorsdetect ${PN}-sensorsdetect-doc" + +# sensors-conf-convert script +PACKAGES =+ "${PN}-sensorsconfconvert" + +# pwmconfig script +PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" + +# isadump and isaset helper program +PACKAGES =+ "${PN}-isatools ${PN}-isatools-dbg ${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" +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 = "${bindir}/sensord ${sysconfdir}/init.d/sensord" +FILES_${PN}-sensord-dbg = "${bindir}/.debug/sensord" +FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" +RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool lighttpd lighttpd-module-cgi" +RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" + +# fancontrol script files +FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${sysconfdir}/init.d/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" + +# sensors-conf-convert script files +FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" +RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" + +# pwmconfig script files +FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" +FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" +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*" -- cgit 1.2.3-korg