[oe-commits] org.oe.dev merge of 'abbb903ea194f8d475fcad5e363b216934593391'

[oe commit]

merge of 'abbb903ea194f8d475fcad5e363b216934593391'
     and 'c17e9e2bf2155f7bde8313938198e7409fead8f9'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2295ef5b7a6917972deadcbabf09fec81a977300
ViewMTN: http://monotone.openembedded.org/revision/info/2295ef5b7a6917972deadcbabf09fec81a977300
Files:
1
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/ttf-fonts/ttf-dejavu_2.18.bb
packages/ttf-fonts/ttf-dejavu_2.23.bb
Diffs:

#
# mt diff -rabbb903ea194f8d475fcad5e363b216934593391 -r2295ef5b7a6917972deadcbabf09fec81a977300
#
# 
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [cb4b1a3fa94063a6a58d7708d18cd876f4054b95]
#    to [ce8102726412e1b04363855281ec051dd12b4ef8]
# 
============================================================
--- packages/lm_sensors/lmsensors-apps_2.10.1.bb	cb4b1a3fa94063a6a58d7708d18cd876f4054b95
+++ packages/lm_sensors/lmsensors-apps_2.10.1.bb	ce8102726412e1b04363855281ec051dd12b4ef8
@@ -1,8 +1,8 @@ DESCRIPTION = "Hardware health monitorin
 DESCRIPTION = "Hardware health monitoring applications"
-HOMEPAGE = "http://secure.netroedge.com/~lm78/"
+HOMEPAGE = "http://www.lm-sensors.org/"
 DEPENDS = "sysfsutils virtual/libiconv"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
            file://prefix-fix.patch;patch=1 \
@@ -13,7 +13,7 @@ do_compile() {
 S = "${WORKDIR}/lm_sensors-${PV}"
 
 do_compile() {
-	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors 
+	oe_runmake user LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" PROG_EXTRA=sensors MACHINE=${TARGET_ARCH}
 }
 
 do_install() {


#
# mt diff -rc17e9e2bf2155f7bde8313938198e7409fead8f9 -r2295ef5b7a6917972deadcbabf09fec81a977300
#
# 
# 
# rename "packages/ttf-fonts/ttf-dejavu_2.18.bb"
#     to "packages/ttf-fonts/ttf-dejavu_2.23.bb"
# 
# patch "packages/ttf-fonts/ttf-dejavu_2.23.bb"
#  from [d6a59ef2ae0c1a9ebaeabf4cf01a83de1df37d44]
#    to [fb12ffa0e0b11e13b88d1a6e8b63489c7c461026]
# 
============================================================
--- packages/ttf-fonts/ttf-dejavu_2.18.bb	d6a59ef2ae0c1a9ebaeabf4cf01a83de1df37d44
+++ packages/ttf-fonts/ttf-dejavu_2.23.bb	fb12ffa0e0b11e13b88d1a6e8b63489c7c461026
@@ -5,12 +5,11 @@ RDEPENDS_ttf-dejavu-common = ""
 LICENSE = "Bitstream Vera"
 RDEPENDS = "ttf-dejavu-common"
 RDEPENDS_ttf-dejavu-common = ""
-PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
            file://30-dejavu-aliases.conf"
 
-S = "${WORKDIR}/dejavu-ttf-${PV}"
+S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf"
 
 do_install_append () { 
 	install -d ${D}${sysconfdir}/fonts/conf.d/