summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-11-26 09:50:08 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-02 05:24:52 -0800
commit760675e0083c26cc195c3650072e2cf92e671d53 (patch)
tree55578fb88cc653364d2bc194dfcb81394e78b498
parent363fd6e0e56b22aaf58c5556064e8be1e4d34567 (diff)
downloadpoky-760675e0083c26cc195c3650072e2cf92e671d53.tar.gz
libgsmd: Upgrade to rev 5394
Rebase fix_machine_init.patch to latest version. Fixed recipe metadata. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-connectivity/gsm/files/fix_machine_init.patch21
-rw-r--r--meta/recipes-connectivity/gsm/gsmd.inc8
3 files changed, 19 insertions, 12 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index cc397f13f8..f422cb61a1 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -59,7 +59,7 @@ SRCREV_pn-kern-tools-native ??= "9722d8decacd2b750f079b3fde7918810700f80e"
59SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" 59SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
60SRCREV_pn-libfakekey ??= "2031" 60SRCREV_pn-libfakekey ??= "2031"
61SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" 61SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
62SRCREV_pn-libgsmd ??= "4335" 62SRCREV_pn-libgsmd ??= "5394"
63SRCREV_pn-libmatchbox ??= "1531" 63SRCREV_pn-libmatchbox ??= "1531"
64SRCREV_pn-libowl ??= "408" 64SRCREV_pn-libowl ??= "408"
65SRCREV_pn-libowl-av ??= "416" 65SRCREV_pn-libowl-av ??= "416"
diff --git a/meta/recipes-connectivity/gsm/files/fix_machine_init.patch b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
index 808bb17b42..9fb64660f6 100644
--- a/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
+++ b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
@@ -1,22 +1,25 @@
1Index: src/gsmd/gsmd.c 1Rebase the patch to latest version.
2=================================================================== 2
3--- a/src/gsmd/gsmd.c (revision 4304) 3By Dongxiao Xu <dongxiao.xu@intel.com>
4+++ b/src/gsmd/gsmd.c (working copy) 4
5@@ -196,13 +196,13 @@ 5diff -ruN gsm-orig/src/gsmd/gsmd.c gsm/src/gsmd/gsmd.c
6--- gsm-orig/src/gsmd/gsmd.c 2010-11-25 10:14:22.000000000 +0800
7+++ gsm/src/gsmd/gsmd.c 2010-11-25 10:14:52.000000000 +0800
8@@ -196,14 +196,11 @@
6 9
7 sms_cb_init(gsmd); 10 sms_cb_init(gsmd);
8 11
9- if (gsmd->vendorpl && gsmd->vendorpl->initsettings){ 12- if (gsmd->vendorpl && gsmd->vendorpl->initsettings){
10+ if (gsmd->vendorpl && gsmd->vendorpl->initsettings) 13+ if (gsmd->vendorpl && gsmd->vendorpl->initsettings)
11 rc |= gsmd->vendorpl->initsettings(gsmd); 14 rc |= gsmd->vendorpl->initsettings(gsmd);
12+ 15- if (gsmd->machinepl && gsmd->machinepl->initsettings)
13+ if (gsmd->machinepl && gsmd->machinepl->initsettings) 16- rc |= gsmd->machinepl->initsettings(gsmd);
14 rc |= gsmd->machinepl->initsettings(gsmd);
15- return rc; 17- return rc;
16- } 18- }
17- else 19- else
18- return rc; 20- return rc;
19+ 21+ if (gsmd->machinepl && gsmd->machinepl->initsettings)
22+ rc |= gsmd->machinepl->initsettings(gsmd);
20+ return rc; 23+ return rc;
21 } 24 }
22 25
diff --git a/meta/recipes-connectivity/gsm/gsmd.inc b/meta/recipes-connectivity/gsm/gsmd.inc
index 02ea4538ff..9818188636 100644
--- a/meta/recipes-connectivity/gsm/gsmd.inc
+++ b/meta/recipes-connectivity/gsm/gsmd.inc
@@ -1,12 +1,16 @@
1SUMMARY = "GSM libraries and daemons" 1SUMMARY = "GSM libraries and daemons"
2DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification" 2DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
3HOMEPAGE = "http://www.openmoko.org" 3HOMEPAGE = "http://www.openmoko.org"
4LICENSE = "GPL LGPL" 4LICENSE = "GPLv2+ & LGPLv2.1+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
6 file://COPYING.library;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://src/util/event.c;beginline=1;endline=21;md5=7fc982f6308a591d1e3581e59c6768ce \
8 file://src/libgsmd/libgsmd_sms.c;beginline=1;endline=19;md5=7bd4cdfab49cfba6a2afc020ee0b0806"
5SECTION = "libs/gsm" 9SECTION = "libs/gsm"
6PROVIDES += "gsmd" 10PROVIDES += "gsmd"
7RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" 11RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
8PV = "0.1+svnr${SRCREV}" 12PV = "0.1+svnr${SRCREV}"
9PR = "r47" 13PR = "r0"
10 14
11SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ 15SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
12 file://fix_machine_init.patch;patch=1 \ 16 file://fix_machine_init.patch;patch=1 \