[oe-commits] org.oe.dev lmsensors-apps: ugly fix to get it properly packaged

[hrw commit]

lmsensors-apps: ugly fix to get it properly packaged

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 9cc1cd6d050938f685ff391b4065f8961f8304a8
ViewMTN: http://monotone.openembedded.org/revision/info/9cc1cd6d050938f685ff391b4065f8961f8304a8
Files:
1
packages/lm_sensors/lmsensors-apps_2.10.1.bb
Diffs:

#
# mt diff -r5f01e841257f96905b797926490b33f2fd2774ea -r9cc1cd6d050938f685ff391b4065f8961f8304a8
#
# 
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b]
#    to [098458d7451b302e662d248e4b54f392a787c643]
# 
============================================================
--- packages/lm_sensors/lmsensors-apps_2.10.1.bb	cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b
+++ packages/lm_sensors/lmsensors-apps_2.10.1.bb	098458d7451b302e662d248e4b54f392a787c643
@@ -5,22 +5,26 @@ SRC_URI = "http://dl.lm-sensors.org/lm-s
 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"
 
+SRC_URI_append_uclibc = "file://iconv.patch;patch=1"
+
 S = "${WORKDIR}/lm_sensors-${PV}"
 
 do_compile() {
-	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors PREFIX=${prefix}
+	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors 
 }
 
 do_install() {
 	oe_runmake user_install DESTDIR=${D}
 
-	# backward compatibility with older OE packages
-	mv ${D}${sbindir}/* ${D}${bindir}
+	install -d ${D}/.usr
+	mv ${D}/* ${D}/.usr
+	mv ${D}/.usr ${D}/usr
 
+	install -d ${D}${sysconfdir}
+	mv ${D}/usr/etc/sensors.conf ${D}${sysconfdir}
 	# move manuals into proper place
 	install -d ${D}${mandir}
 	rm -rf ${D}${mandir}/*
@@ -28,7 +32,7 @@ do_install() {
 
 	# 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}${sbindir}/fancontrol* ${D}${sbindir}/pwmconfig ${D}${sbindir}/sensors-detect
 	rm ${D}${mandir}/man8/fancontrol.8 ${D}${mandir}/man8/pwmconfig.8 ${D}${mandir}/man8/sensors-detect.8
 }