diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-07 17:47:52 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-07 17:47:52 +0000 |
commit | 209f1c683008652f45d8de04078e53f0b91bd8ee (patch) | |
tree | 9f42b0ebd8bf7507567bf6c5c01e0ddc5aa9b131 /packages | |
parent | 096061d2395d5ca861d542c599c18741d79a41c9 (diff) | |
parent | 9156fc13516db49e349c2ce8421484e618f1457d (diff) |
merge of '0e7d709ae536ea44f5cea432f11a470b4b8508cc'
and '9cc1cd6d050938f685ff391b4065f8961f8304a8'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/lm_sensors/files/prefix-fix.patch | 14 | ||||
-rw-r--r-- | packages/lm_sensors/lmsensors-apps_2.10.1.bb | 14 |
2 files changed, 23 insertions, 5 deletions
diff --git a/packages/lm_sensors/files/prefix-fix.patch b/packages/lm_sensors/files/prefix-fix.patch new file mode 100644 index 0000000000..66ec55c150 --- /dev/null +++ b/packages/lm_sensors/files/prefix-fix.patch @@ -0,0 +1,14 @@ +Index: lm_sensors-2.10.1/Makefile +=================================================================== +--- lm_sensors-2.10.1.orig/Makefile 2007-10-07 19:22:51.000000000 +0200 ++++ lm_sensors-2.10.1/Makefile 2007-10-07 19:23:13.000000000 +0200 +@@ -74,9 +74,6 @@ + # everything, set DESTDIR to the extra prefix. + DESTDIR := + +-# This is the prefix that will be used for almost all directories below. +-PREFIX := /usr/local +- + # Your C compiler + CC := gcc + diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb index 84fe358647..ce188beb64 100644 --- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb +++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb @@ -5,22 +5,26 @@ LICENSE = "GPL" 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 } |