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>

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"
 SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
 SRCREV_pn-libfakekey ??= "2031"
 SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsmd ??= "4335"
+SRCREV_pn-libgsmd ??= "5394"
 SRCREV_pn-libmatchbox ??= "1531"
 SRCREV_pn-libowl ??= "408"
 SRCREV_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 @@
-Index: src/gsmd/gsmd.c
-===================================================================
---- a/src/gsmd/gsmd.c   (revision 4304)
-+++ b/src/gsmd/gsmd.c   (working copy)
-@@ -196,13 +196,13 @@
+Rebase the patch to latest version.
+
+By Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN gsm-orig/src/gsmd/gsmd.c gsm/src/gsmd/gsmd.c
+--- gsm-orig/src/gsmd/gsmd.c    2010-11-25 10:14:22.000000000 +0800
++++ gsm/src/gsmd/gsmd.c 2010-11-25 10:14:52.000000000 +0800
+@@ -196,14 +196,11 @@
  
         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);
+-               if (gsmd->machinepl && gsmd->machinepl->initsettings)
+-                       rc |= gsmd->machinepl->initsettings(gsmd);
 -               return rc;
 -       }       
 -       else
 -               return rc;
-+
++       if (gsmd->machinepl && gsmd->machinepl->initsettings)
++               rc |= gsmd->machinepl->initsettings(gsmd);
 +       return rc;
  }
  
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 @@
 SUMMARY = "GSM libraries and daemons"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
-LICENSE = "GPL LGPL"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://COPYING.library;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+                    file://src/util/event.c;beginline=1;endline=21;md5=7fc982f6308a591d1e3581e59c6768ce \
+                    file://src/libgsmd/libgsmd_sms.c;beginline=1;endline=19;md5=7bd4cdfab49cfba6a2afc020ee0b0806"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r47"
+PR = "r0"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://fix_machine_init.patch;patch=1 \