openbmap-logger_0.4.0.bb: add a patch to make it compatible with fsogsmd
authorKlaus Kurzmann <mok@fluxnetz.de>
Fri, 21 May 2010 20:11:46 +0000 (22:11 +0200)
committerKlaus Kurzmann <mok@fluxnetz.de>
Fri, 21 May 2010 20:11:46 +0000 (22:11 +0200)
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch [new file with mode: 0644]
recipes/openbmap/openbmap-logger_0.4.0.bb

diff --git a/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch b/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch
new file mode 100644 (file)
index 0000000..93da2a6
--- /dev/null
@@ -0,0 +1,22 @@
+diff -uri openbmap-logger-0.4.0/openbmap/logger.py openbmap-logger-0.4.0-fsogsmd/openbmap/logger.py
+--- openbmap-logger-0.4.0/openbmap/logger.py   2009-07-20 19:07:43.000000000 +0200
++++ openbmap-logger-0.4.0-fsogsmd/openbmap/logger.py   2010-05-21 22:00:02.024118210 +0200
+@@ -220,7 +220,10 @@
+         """If available, returns the manufacturer, model and revision."""
+         #TODO call the dBus interface only if instance attributes are not set.
+         obj = dbus.SystemBus().get_object('org.freesmartphone.ogsmd', '/org/freesmartphone/GSM/Device')
+-        data = dbus.Interface(obj, 'org.freesmartphone.GSM.Device').GetInfo()
++      try:
++            data = dbus.Interface(obj, 'org.freesmartphone.GSM.Device').GetInfo()
++      except:
++            data = dbus.Interface(obj, 'org.freesmartphone.Info').GetInfo()
+         if 'manufacturer' in data:
+             # At the moment the returned string starts and ends with '"' for model and revision
+             self._manufacturer = data['manufacturer'].strip('"')
+@@ -1392,4 +1395,4 @@
+         mainloop.quit()
+     else:
+         logging.info("normal exit.")
+-        sys.exit( 0 )
+\ Kein Zeilenumbruch am Dateiende.
++        sys.exit( 0 )
index fa7e6c9..bbaec47 100644 (file)
@@ -1,8 +1,11 @@
 DESCRIPTION = "openBmap logger and uploader of GPS/GSM data"
 SECTION = "x11/utils"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz"
+SRC_URI = "\
+${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz \
+file://fsogsmd-fix.patch;patch=1 \
+"
 
 inherit distutils