lmsensors-apps: totally changed packaging + build of sensors application

lmsensors-apps contain all utils which do not need libsensors
lmsensors-sensors contain 'sensors' application + config (it depend on libsensors)

1 files changed, 26 insertions, 14 deletions

diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb
index bbe484f74e..84fe358647 100644
--- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb
+++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb
@@ -1,32 +1,44 @@
-# lmsensors-apps .bb build file
-# Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see /COPYING)
-
 DESCRIPTION = "Hardware health monitoring applications"
 HOMEPAGE = "http://secure.netroedge.com/~lm78/"
 DEPENDS = "libsysfs virtual/libiconv"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
            file://iconv.patch;patch=1 \
+           file://prefix-fix.patch;patch=1 \
            file://add-sysfs-ldflags.patch;patch=1"
 
 S = "${WORKDIR}/lm_sensors-${PV}"
 
 do_compile() {
-	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user
+	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors PREFIX=${prefix}
 }
 
-APPS = "${S}/prog/dump/i2cdump ${S}/prog/dump/i2cset ${S}/prog/detect/i2cdetect"
-
 do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 ${APPS} ${D}${bindir}
+	oe_runmake user_install DESTDIR=${D}
+
+	# backward compatibility with older OE packages
+	mv ${D}${sbindir}/* ${D}${bindir}
+
+	# move manuals into proper place
+	install -d ${D}${mandir}
+	rm -rf ${D}${mandir}/*
+	mv ${D}/usr/man/* ${D}${mandir}
+
+	# remove perl or bash scripts
+	rm ${D}${bindir}/*.pl ${D}${bindir}/ddcmon
+	rm ${D}${bindir}/fancontrol ${D}${bindir}/pwmconfig ${D}${bindir}/sensors-detect
+	rm ${D}${mandir}/man8/fancontrol.8 ${D}${mandir}/man8/pwmconfig.8 ${D}${mandir}/man8/sensors-detect.8
 }
 
-PACKAGES="sensors-i2cdump sensors-i2cset sensors-i2cdetect"
+PACKAGES =+  "libsensors libsensors-dev libsensors-dbg libsensors-doc"
+PACKAGES =+ "lmsensors-sensors lmsensors-sensors-dbg lmsensors-sensors-doc"
 
-FILES_sensors-i2cdump="${bindir}/i2cdump"
-FILES_sensors-i2cset="${bindir}/i2cset"
-FILES_sensors-i2cdetect="${bindir}/i2cdetect"
+FILES_lmsensors-sensors = "${bindir}/sensors ${sysconfdir}"
+FILES_lmsensors-sensors-dbg = "${bindir}/.debug/sensors"
+FILES_lmsensors-sensors-doc = "${mandir}/man1 ${mandir}/man5"
+FILES_libsensors = "${libdir}/libsensors.so.*"
+FILES_libsensors-dbg = "${libdir}/.debug"
+FILES_libsensors-dev = "${libdir}/libsensors.so ${libdir}/libsensors.a ${includedir}"
+FILES_libsensors-doc = "${mandir}/man3"