[oe-commits] org.oe.dev merge of '6fa9ef4e1d87a14ef1a17903570daeb24f495240'

[oe commit]

merge of '6fa9ef4e1d87a14ef1a17903570daeb24f495240'
     and 'af90841f4497299774d1cfae17dd753a99956544'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4e808662b364403781cd4e899198db521c13afc9
ViewMTN: http://monotone.openembedded.org/revision/info/4e808662b364403781cd4e899198db521c13afc9
Files:
1
packages/cairo/cairo_1.5.2.bb
packages/cairo/cairo_1.6.4.bb
packages/netperf/netperf_2.4.2.bb
packages/netperf/netperf_2.4.4.bb
packages/openipmi
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -r6fa9ef4e1d87a14ef1a17903570daeb24f495240 -r4e808662b364403781cd4e899198db521c13afc9
#
#
#
# rename "packages/cairo/cairo_1.5.2.bb"
#     to "packages/cairo/cairo_1.6.4.bb"
# 
# rename "packages/netperf/netperf_2.4.2.bb"
#     to "packages/netperf/netperf_2.4.4.bb"
# 
# add_dir "packages/openipmi"
# 
# patch "packages/netperf/netperf_2.4.4.bb"
#  from [04ccea09108ac141e06977b7b5545f91cd5901f5]
#    to [25eec6c603cb3b56d9cffcfd1f1e7ee0c27695b5]
#
============================================================
--- packages/netperf/netperf_2.4.2.bb	04ccea09108ac141e06977b7b5545f91cd5901f5
+++ packages/netperf/netperf_2.4.4.bb	25eec6c603cb3b56d9cffcfd1f1e7ee0c27695b5
@@ -3,7 +3,7 @@ LICENSE = "netperf"
 HOMEPAGE = "http://www.netperf.org/"
 LICENSE = "netperf"
 
-SRC_URI="${DEBIAN_MIRROR}/non-free/n/netperf/netperf_${PV}.orig.tar.gz \
+SRC_URI="ftp://ftp.netperf.org/netperf/netperf-${PV}.tar.bz2 \
          file://init"
 
 inherit update-rc.d autotools
@@ -12,11 +12,6 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6"
 
 CFLAGS_append = " -DDO_UNIX -DDO_IPV6"
 
-do_configure_prepend() {
-        install -m 0644 ${S}/m4/m4/m4/*.m4 ${S}/m4/
-        install -m 0644 ${S}/src/missing/m4/*.m4 ${S}/m4/
-}
-
 do_install() {
         install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d
         install -m 4755 src/netperf ${D}${bindir}


#
# mt diff -raf90841f4497299774d1cfae17dd753a99956544 -r4e808662b364403781cd4e899198db521c13afc9
#
#
#
# patch "conf/distro/angstrom-2008.1.conf"
#  from [1426e85436d24f9292dd3115736fef8e6fae4887]
#    to [947d891b5c7e5a12292a5157cb870e8fae548110]
#
============================================================
--- conf/distro/angstrom-2008.1.conf	1426e85436d24f9292dd3115736fef8e6fae4887
+++ conf/distro/angstrom-2008.1.conf	947d891b5c7e5a12292a5157cb870e8fae548110
@@ -156,6 +156,7 @@ PREFERRED_PROVIDER_libxss               
 PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_libxss                = "libxss"
+PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"