ofono: Ship test scripts as ofono-test-utils, ship udev rules

Also add USB-ID for a Sierra modem and add INC_PR.

Signed-off-by: Jan Lübbe <jluebbe@debian.org>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>

diff --git a/recipes/ofono/ofono.inc b/recipes/ofono/ofono.inc
index 9089670..9a83bcf 100644 (file)
--- a/recipes/ofono/ofono.inc
+++ b/recipes/ofono/ofono.inc
@@ -4,11 +4,14 @@ DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono sup
 LICENSE  = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://src/ofono.h;beginline=1;endline=20;md5=85d349dd8ec342c8f40d90e520f22779"
+INC_PR = "r3"
 
 inherit autotools pkgconfig update-rc.d
 
 DEPENDS  = "dbus glib-2.0 udev"
 
+EXTRA_OECONF += " --disable-bluetooth --enable-test"
+
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
 
@@ -17,3 +20,10 @@ do_install_append() {
   install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
 }
 
+PACKAGES =+ "${PN}-test-utils"
+
+RDEPENDS_${PN}-test-utils += "python-dbus"
+
+FILES_${PN} += "/lib/udev/rules.d"
+FILES_${PN}-test-utils += "${libdir}/ofono/test"
+

diff --git a/recipes/ofono/ofono/sierra-mc8790.patch b/recipes/ofono/ofono/sierra-mc8790.patch
new file mode 100644 (file)
index 0000000..34dc4c4
--- /dev/null
+++ b/recipes/ofono/ofono/sierra-mc8790.patch
@@ -0,0 +1,24 @@
+From 1a18604648d90b90b44a6b2d2cd65d0b4ba864ed Mon Sep 17 00:00:00 2001
+From: Jan Luebbe <jluebbe@debian.org>
+Date: Wed, 16 Feb 2011 14:50:41 +0100
+Subject: [PATCH] plugins/ofono.rules: add ID for Sierra Wireless MC8790
+
+---
+ plugins/ofono.rules |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/ofono.rules b/plugins/ofono.rules
+index 111f071..f381881 100644
+--- a/plugins/ofono.rules
++++ b/plugins/ofono.rules
+@@ -11,6 +11,7 @@ SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ATTRS{bInterfaceClass}=="ff",
+ ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9205", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_GOBI_TYPE}="modem"
+ 
+ # Sierra Wireless HSPA Modem
++ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_SIERRA_TYPE}="modem"
+ ATTRS{idVendor}=="1199", ATTRS{idProduct}=="6880", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_SIERRA_TYPE}="modem"
+ ATTRS{idVendor}=="1199", ATTRS{idProduct}=="6890", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_SIERRA_TYPE}="modem"
+ 
+-- 
+1.7.2.3
+

diff --git a/recipes/ofono/ofono_0.37.bb b/recipes/ofono/ofono_0.37.bb
index 1c1c501..89ae8c2 100644 (file)
--- a/recipes/ofono/ofono_0.37.bb
+++ b/recipes/ofono/ofono_0.37.bb
@@ -1,6 +1,6 @@
 require ofono.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI  = "http://www.kernel.org/pub/linux/network/ofono/${P}.tar.bz2 \
                  file://ofono"

diff --git a/recipes/ofono/ofono_0.40.bb b/recipes/ofono/ofono_0.40.bb
index e952218..b371bf0 100644 (file)
--- a/recipes/ofono/ofono_0.40.bb
+++ b/recipes/ofono/ofono_0.40.bb
@@ -1,9 +1,10 @@
 require ofono.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI  = "http://www.kernel.org/pub/linux/network/ofono/${P}.tar.bz2 \
-                 file://ofono"
+            file://sierra-mc8790.patch \
+            file://ofono"
 
 SRC_URI[md5sum] = "a986891d41fdb025c01455008e108075"
 SRC_URI[sha256sum] = "e5c6532ea109ddacecc87031c4c8a37a604cbc26e063a2d1338b951bb226ec9a"