Patchwork ofono: upgrade to 1.6

login
register
mail settings
Submitter Martin Jansa
Date April 29, 2012, 8:46 a.m.
Message ID <1335689202-30557-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/26569/
State Accepted
Commit 72684aac1d97469ee5cf9ef0d017a8b933e2a6d6
Headers show

Comments

Martin Jansa - April 29, 2012, 8:46 a.m.
* 1.5 is not compatible with glib-2.32 and newer
  | In file included from gisi/client.h:30:0,
  |                  from gisi/client.c:33:
  |/OE/shr-core/tmp-eglibc/sysroots/spitz/usr/include/glib-2.0/glib/gtypes.h:28:2: error: #error "Only <glib.h> can be included directly."

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-connectivity/ofono/ofono_1.5.bb |   14 --------------
 meta/recipes-connectivity/ofono/ofono_1.6.bb |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.5.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_1.6.bb
Saul Wold - May 1, 2012, 6:29 p.m.
On 04/29/2012 01:46 AM, Martin Jansa wrote:
> * 1.5 is not compatible with glib-2.32 and newer
>    | In file included from gisi/client.h:30:0,
>    |                  from gisi/client.c:33:
>    |/OE/shr-core/tmp-eglibc/sysroots/spitz/usr/include/glib-2.0/glib/gtypes.h:28:2: error: #error "Only<glib.h>  can be included directly."
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
>   meta/recipes-connectivity/ofono/ofono_1.5.bb |   14 --------------
>   meta/recipes-connectivity/ofono/ofono_1.6.bb |   15 +++++++++++++++
>   2 files changed, 15 insertions(+), 14 deletions(-)
>   delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.5.bb
>   create mode 100644 meta/recipes-connectivity/ofono/ofono_1.6.bb
>
> diff --git a/meta/recipes-connectivity/ofono/ofono_1.5.bb b/meta/recipes-connectivity/ofono/ofono_1.5.bb
> deleted file mode 100644
> index dad813f..0000000
> --- a/meta/recipes-connectivity/ofono/ofono_1.5.bb
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -require ofono.inc
> -
> -PR = "r1"
> -
> -SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
> -	          file://ofono"
> -
> -EXTRA_OECONF += "\
> -    --enable-test \
> -    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
> -"
> -
> -SRC_URI[md5sum] = "a54935a2a86b90300410c6c033284f6c"
> -SRC_URI[sha256sum] = "3a70608c17f3dca34c1e057aacdf836021322dfdcaf9edc777119eafe48076b3"
> diff --git a/meta/recipes-connectivity/ofono/ofono_1.6.bb b/meta/recipes-connectivity/ofono/ofono_1.6.bb
> new file mode 100644
> index 0000000..386ffee
> --- /dev/null
> +++ b/meta/recipes-connectivity/ofono/ofono_1.6.bb
> @@ -0,0 +1,15 @@
> +require ofono.inc
> +
> +SRC_URI  = "\
> +  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.bz2 \
> +  file://ofono \
> +"
> +SRC_URI[md5sum] = "d863b2b650a525cf75056085398bc8ef"
> +SRC_URI[sha256sum] = "63e38ea1cf35b00ecbab7611c6caa2adcd33eb10495f7a9f72013d4ab7a14c98"
> +
> +
> +EXTRA_OECONF += "\
> +    --enable-test \
> +    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
> +"
> +

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/ofono/ofono_1.5.bb b/meta/recipes-connectivity/ofono/ofono_1.5.bb
deleted file mode 100644
index dad813f..0000000
--- a/meta/recipes-connectivity/ofono/ofono_1.5.bb
+++ /dev/null
@@ -1,14 +0,0 @@ 
-require ofono.inc
-
-PR = "r1"
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
-	          file://ofono"
-
-EXTRA_OECONF += "\
-    --enable-test \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
-"
-
-SRC_URI[md5sum] = "a54935a2a86b90300410c6c033284f6c"
-SRC_URI[sha256sum] = "3a70608c17f3dca34c1e057aacdf836021322dfdcaf9edc777119eafe48076b3"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.6.bb b/meta/recipes-connectivity/ofono/ofono_1.6.bb
new file mode 100644
index 0000000..386ffee
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_1.6.bb
@@ -0,0 +1,15 @@ 
+require ofono.inc
+
+SRC_URI  = "\
+  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.bz2 \
+  file://ofono \
+"
+SRC_URI[md5sum] = "d863b2b650a525cf75056085398bc8ef"
+SRC_URI[sha256sum] = "63e38ea1cf35b00ecbab7611c6caa2adcd33eb10495f7a9f72013d4ab7a14c98"
+
+
+EXTRA_OECONF += "\
+    --enable-test \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
+"
+