summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-08-01 14:12:38 +0000
committerRoss Burton <ross@openedhand.com>2008-08-01 14:12:38 +0000
commit9f55811c01db994df701d2d19e347033f362b60d (patch)
tree4afe32600baef6994aeeefdc06054fda0750b6e0 /meta/packages
parent6f626196ecd14789b14a251421da43ad97d3b861 (diff)
downloadopenembedded-core-9f55811c01db994df701d2d19e347033f362b60d.tar.gz
openembedded-core-9f55811c01db994df701d2d19e347033f362b60d.tar.bz2
openembedded-core-9f55811c01db994df701d2d19e347033f362b60d.zip
gsmd: add a patch to fix initialisation segfault
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5006 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gsm/files/fix_machine_init.patch23
-rw-r--r--meta/packages/gsm/gsmd.inc3
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/packages/gsm/files/fix_machine_init.patch b/meta/packages/gsm/files/fix_machine_init.patch
new file mode 100644
index 0000000000..808bb17b42
--- /dev/null
+++ b/meta/packages/gsm/files/fix_machine_init.patch
@@ -0,0 +1,23 @@
+Index: src/gsmd/gsmd.c
+===================================================================
+--- a/src/gsmd/gsmd.c (revision 4304)
++++ b/src/gsmd/gsmd.c (working copy)
+@@ -196,13 +196,13 @@
+
+ sms_cb_init(gsmd);
+
+- if (gsmd->vendorpl && gsmd->vendorpl->initsettings){
++ if (gsmd->vendorpl && gsmd->vendorpl->initsettings)
+ rc |= gsmd->vendorpl->initsettings(gsmd);
++
++ if (gsmd->machinepl && gsmd->machinepl->initsettings)
+ rc |= gsmd->machinepl->initsettings(gsmd);
+- return rc;
+- }
+- else
+- return rc;
++
++ return rc;
+ }
+
+ static int firstcmd_response = 0;
diff --git a/meta/packages/gsm/gsmd.inc b/meta/packages/gsm/gsmd.inc
index 4ce23d51f5..ac341ed7ce 100644
--- a/meta/packages/gsm/gsmd.inc
+++ b/meta/packages/gsm/gsmd.inc
@@ -5,9 +5,10 @@ SECTION = "libs/gsm"
PROVIDES += "gsmd"
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
PV = "0.1+svnr${SRCREV}"
-PR = "r44"
+PR = "r45"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
+ file://fix_machine_init.patch;patch=1 \
file://gsmd \
file://default"
S = "${WORKDIR}/gsm"