From a52de6f29b58871c946b1ada34bdc95e3fb4895f Mon Sep 17 00:00:00 2001
From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Thu, 25 Nov 2010 13:52:23 +0800
Subject: ofono: Upgrade to version 0.33

Fixed recipe metadata.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/recipes-connectivity/ofono/files/ofono   | 42 ---------------------------
 meta/recipes-connectivity/ofono/ofono.inc     |  4 ++-
 meta/recipes-connectivity/ofono/ofono/ofono   | 42 +++++++++++++++++++++++++++
 meta/recipes-connectivity/ofono/ofono_0.17.bb |  7 -----
 meta/recipes-connectivity/ofono/ofono_0.33.bb |  9 ++++++
 5 files changed, 54 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/files/ofono
 create mode 100644 meta/recipes-connectivity/ofono/ofono/ofono
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_0.17.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_0.33.bb

(limited to 'meta')

diff --git a/meta/recipes-connectivity/ofono/files/ofono b/meta/recipes-connectivity/ofono/files/ofono
deleted file mode 100644
index 6d46fb8966..0000000000
--- a/meta/recipes-connectivity/ofono/files/ofono
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/sbin/ofonod
-PIDFILE=/var/run/ofonod.pid
-DESC="Telephony daemon"
-
-if [ -f /etc/default/ofono] ; then
-	. /etc/default/ofono
-fi
-
-set -e
-
-do_start() {
-	$DAEMON
-}
-
-do_stop() {
-	start-stop-daemon --stop --name ofonod --quiet
-}
-
-case "$1" in
-  start)
-	echo "Starting $DESC"
-	do_start
-	;;
-  stop)
-	echo "Stopping $DESC"
-	do_stop
-	;;
-  restart|force-reload)
-	echo "Restarting $DESC"
-	do_stop
-	sleep 1
-	do_start
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index eddfa47b25..5abc92ef52 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -1,7 +1,9 @@
 HOMEPAGE = "http://www.ofono.org"
 SUMMARY  = "open source telephony"
 DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands."
-LICENSE  = "GPL"
+LICENSE  = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
+                    file://src/ofono.h;beginline=1;endline=20;md5=85d349dd8ec342c8f40d90e520f22779"
 
 inherit autotools pkgconfig update-rc.d
 
diff --git a/meta/recipes-connectivity/ofono/ofono/ofono b/meta/recipes-connectivity/ofono/ofono/ofono
new file mode 100644
index 0000000000..6d46fb8966
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/ofono
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON=/usr/sbin/ofonod
+PIDFILE=/var/run/ofonod.pid
+DESC="Telephony daemon"
+
+if [ -f /etc/default/ofono] ; then
+	. /etc/default/ofono
+fi
+
+set -e
+
+do_start() {
+	$DAEMON
+}
+
+do_stop() {
+	start-stop-daemon --stop --name ofonod --quiet
+}
+
+case "$1" in
+  start)
+	echo "Starting $DESC"
+	do_start
+	;;
+  stop)
+	echo "Stopping $DESC"
+	do_stop
+	;;
+  restart|force-reload)
+	echo "Restarting $DESC"
+	do_stop
+	sleep 1
+	do_start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta/recipes-connectivity/ofono/ofono_0.17.bb b/meta/recipes-connectivity/ofono/ofono_0.17.bb
deleted file mode 100644
index 02b64e5b28..0000000000
--- a/meta/recipes-connectivity/ofono/ofono_0.17.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require ofono.inc
-
-PR = "r0"
-
-SRC_URI  = "http://www.kernel.org/pub/linux/network/ofono/${P}.tar.bz2 \
-	          file://ofono"
-
diff --git a/meta/recipes-connectivity/ofono/ofono_0.33.bb b/meta/recipes-connectivity/ofono/ofono_0.33.bb
new file mode 100644
index 0000000000..1d9a8afb73
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_0.33.bb
@@ -0,0 +1,9 @@
+require ofono.inc
+
+PR = "r0"
+
+SRC_URI  = "http://www.kernel.org/pub/linux/network/ofono/${P}.tar.bz2 \
+	          file://ofono"
+
+SRC_URI[md5sum] = "001160996d0c00e7b8da575e1fff1bd1"
+SRC_URI[sha256sum] = "1b7ce568e32518f404231389150cea5d4abfb19e09eaa6e7a280be2e5186c82f"
-- 
cgit v1.2.3-54-g00ecf