From 663373c4fb0fa7919cdf1be9ef3cdfa44c8d3048 Mon Sep 17 00:00:00 2001
From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Tue, 28 Jun 2011 14:51:51 +0800
Subject: ofono: upgrade to version 0.50

(From OE-Core rev: f7bb581c5bbcc6c9a73430b9f45f532207c86af7)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/default-versions.inc |  4 ----
 meta/recipes-connectivity/ofono/ofono.inc     |  2 ++
 meta/recipes-connectivity/ofono/ofono_0.45.bb |  9 ---------
 meta/recipes-connectivity/ofono/ofono_0.50.bb | 13 +++++++++++++
 4 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_0.45.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_0.50.bb

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 0abbd8f87d..377aba5860 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -12,7 +12,3 @@ PREFERRED_VERSION_python-native ?= "2.6.6"
 
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
-
-
-
-
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index ee3bc3e2b1..4fc969c94a 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -15,5 +15,7 @@ INITSCRIPT_PARAMS = "defaults 22"
 do_install_append() {
   install -d ${D}${sysconfdir}/init.d/
   install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+  install -d ${D}${sysconfdir}/udev/rules.d/
+  install -m 0644 ${S}/plugins/97-ofono.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
diff --git a/meta/recipes-connectivity/ofono/ofono_0.45.bb b/meta/recipes-connectivity/ofono/ofono_0.45.bb
deleted file mode 100644
index 4a8950fd36..0000000000
--- a/meta/recipes-connectivity/ofono/ofono_0.45.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require ofono.inc
-
-PR = "r0"
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \
-	          file://ofono"
-
-SRC_URI[md5sum] = "31dabb077e7592ba36913bd9d0c76b94"
-SRC_URI[sha256sum] = "5541e832fb72c6c647b663e5ee55384a33efaee5a34c4544e3a16af94892f47e"
diff --git a/meta/recipes-connectivity/ofono/ofono_0.50.bb b/meta/recipes-connectivity/ofono/ofono_0.50.bb
new file mode 100644
index 0000000000..eb82e3967e
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_0.50.bb
@@ -0,0 +1,13 @@
+require ofono.inc
+
+PR = "r0"
+
+SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \
+	          file://ofono"
+
+EXTRA_OECONF += "\
+    --enable-test \
+"
+
+SRC_URI[md5sum] = "b2656fd0bbf33f926fc86c1e8915d697"
+SRC_URI[sha256sum] = "f8f8dd917847a007e4d441b949efc4d28dc3644526d5293016844c2536c65ff9"
-- 
cgit v1.2.3-54-g00ecf