aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Krzyszkowiak <seba.dos1@gmail.com>2009-10-24 19:03:49 +0000
committerKlaus Kurzmann <mok@fluxnetz.de>2009-10-26 17:15:30 +0100
commit623ff70d0e0401b55cea1a8a3cfbd8759842ca9a (patch)
treef60a97ea82588a2d21f3a860937af96aca0a9730
parenta0d1f55851b78b2265ee7a16cf5bc0d585b3b3e8 (diff)
downloadopenembedded-623ff70d0e0401b55cea1a8a3cfbd8759842ca9a.tar.gz
openembedded-623ff70d0e0401b55cea1a8a3cfbd8759842ca9a.tar.bz2
openembedded-623ff70d0e0401b55cea1a8a3cfbd8759842ca9a.zip
shr/merge: sync frameworkd recipe with shr/import and add patch for opimd support in oeventsd for SHR distro
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
-rw-r--r--recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch27
-rw-r--r--recipes/freesmartphone/frameworkd_git.bb4
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch
new file mode 100644
index 0000000000..4dc5dd3a84
--- /dev/null
+++ b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch
@@ -0,0 +1,27 @@
+--- a/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:44:53.000000000 +0200
++++ b/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:42:43.000000000 +0200
+@@ -197,8 +197,7 @@
+ class IncomingMessageTrigger(DBusTrigger):
+ #============================================================================#
+ """
+- A custom dbus trigger for org.freesmartphone.GSM.SIM.IncomingStoredMessage
+- TODO: change to opimd interface
++ A custom dbus trigger for org.freesmartphone.PIM.Messages.IncomingMessage
+ """
+
+ function_name = 'IncomingMessage'
+@@ -207,10 +206,10 @@
+ bus = dbus.SystemBus()
+ super(IncomingMessageTrigger, self).__init__(
+ bus,
+- 'org.freesmartphone.ogsmd',
+- '/org/freesmartphone/GSM/Device',
+- 'org.freesmartphone.GSM.SIM',
+- 'IncomingStoredMessage'
++ 'org.freesmartphone.opimd',
++ '/org/freesmartphone/PIM/Messages',
++ 'org.freesmartphone.PIM.Messages',
++ 'IncomingMessage'
+ )
+ def on_signal(self, index):
+ logger.info("Receive IncomingMessage on index = %s" % index)
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 25ddadccf0..f042828bb8 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
#DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
PV = "0.9.5.9+gitr${SRCPV}"
-PR = "r1"
+PR = "r2"
inherit distutils update-rc.d
@@ -16,6 +16,8 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
file://frameworkd \
file://frameworkd.conf \
"
+SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1"
+
S = "${WORKDIR}/git"
do_configure_append() {