[oe-commits] Klaus Kurzmann : fsodeviced: fix parsing error and disable accel and rfkill

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 83bbeb2722b8ecc8e4a862ced78a355e478d1829
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=83bbeb2722b8ecc8e4a862ced78a355e478d1829

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Jan  9 00:32:55 2010 +0100

fsodeviced: fix parsing error and disable accel and rfkill
in om-gta02 config as fsodeviced segfaults with one of
those two enabled.

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/freesmartphone/fsodeviced/fsodeviced.conf |   24 ++++++++++----------
 recipes/freesmartphone/fsodeviced_git.bb          |    5 +---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/fsodeviced.conf
index 4e72778..0d7b43a 100644
--- a/recipes/freesmartphone/fsodeviced/fsodeviced.conf
+++ b/recipes/freesmartphone/fsodeviced/fsodeviced.conf
@@ -17,17 +17,17 @@ log_destination = /var/log/fsodeviced.log
 
 [fsodevice.accelerometer]
 # Which accelerometer variant plugin to use: none (default), lis302
-device_type = lis302
-
-[fsodevice.accelerometer_lis302]
-# Which input node to read from
-inputnode = /input/event2
-# How many samples to process, when in use
-sample_rate = 100
-# Threshhold to program, when in use
-threshold = 100
-# Scale to program, when in use
-full_scale = 2.3
+#device_type = lis302
+
+#[fsodevice.accelerometer_lis302]
+## Which input node to read from
+#inputnode = /input/event2
+## How many samples to process, when in use
+#sample_rate = 100
+## Threshhold to program, when in use
+#threshold = 100
+## Scale to program, when in use
+#full_scale = 2.3
 
 [fsodevice.player_alsa]
 # No settings yet
@@ -51,7 +51,7 @@ player_type = alsa
 [fsodevice.kernel26_powersupply]
 # No settings yet
 
-[fsodevice.kernel26_rfkill]
+#[fsodevice.kernel26_rfkill]
 # No settings yet
 
 [fsodevice.kernel26_rtc]
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 69c948f..640f9d9 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -27,7 +27,4 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/fsodeviced.conf ${D}${sysconfdir}/freesmartphone/
 }
 
-FILES_${PN} += "
-	${sysconfdir}/init.d/fsodeviced \
-	${sysconfdir}/freesmartphone/fsodeviced.conf \
-"
+FILES_${PN} += "${sysconfdir}/init.d/fsodeviced ${sysconfdir}/freesmartphone/fsodeviced.conf"