From bee45587f8f7600274f2c2df4b023210f3b8a41a Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Wed, 4 Mar 2009 19:30:33 +0100
Subject: frameworkd: catch up with new machine name for om-gta03

---
 .../frameworkd/om-3d7k/frameworkd.conf             | 30 ++++++++++++++++++++++
 .../frameworkd/om-gta03/frameworkd.conf            | 30 ----------------------
 packages/freesmartphone/frameworkd_git.bb          |  5 ++--
 3 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 packages/freesmartphone/frameworkd/om-3d7k/frameworkd.conf
 delete mode 100644 packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf

(limited to 'packages')

diff --git a/packages/freesmartphone/frameworkd/om-3d7k/frameworkd.conf b/packages/freesmartphone/frameworkd/om-3d7k/frameworkd.conf
new file mode 100644
index 0000000000..d48bc0815c
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/om-3d7k/frameworkd.conf
@@ -0,0 +1,30 @@
+[frameworkd]
+version = 1
+log_level = INFO
+log_to = syslog
+
+[odeviced.audio]
+# set default alsa scenario
+default_scenario = stereoout
+# set path to alsa scenario files
+scenario_dir = /usr/share/openmoko/scenarios
+
+[odeviced.input]
+# Keys
+report1 = AUX,key,169,1
+report2 = POWER,key,116,1
+report3 = USB,key,356,0
+report4 = HEADSET,switch,2,0
+
+[ogsmd]
+# GTA03 has a Cinterion MC75i
+modemtype = cinterion_mc75
+
+[ogpsd]
+disable = 1
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
diff --git a/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf
deleted file mode 100644
index d48bc0815c..0000000000
--- a/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[frameworkd]
-version = 1
-log_level = INFO
-log_to = syslog
-
-[odeviced.audio]
-# set default alsa scenario
-default_scenario = stereoout
-# set path to alsa scenario files
-scenario_dir = /usr/share/openmoko/scenarios
-
-[odeviced.input]
-# Keys
-report1 = AUX,key,169,1
-report2 = POWER,key,116,1
-report3 = USB,key,356,0
-report4 = HEADSET,switch,2,0
-
-[ogsmd]
-# GTA03 has a Cinterion MC75i
-modemtype = cinterion_mc75
-
-[ogpsd]
-disable = 1
-
-[opreferencesd]
-rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
-
-[oeventsd]
-rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index a16831281e..14aa183d94 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -4,8 +4,8 @@ AUTHOR = "FreeSmartphone.Org Development Team"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.4.9+gitr${SRCREV}"
-PR = "r5"
+PV = "0.8.5.1+gitr${SRCREV}"
+PR = "r0"
 
 inherit distutils update-rc.d
 
@@ -56,6 +56,7 @@ RRECOMMENDS_${PN} += "\
 # - recommend MUXer on platforms that require one
 RDEPENDS_${PN}_append_om-gta01 = " fso-gsm0710muxd"
 RDEPENDS_${PN}_append_om-gta02 = " fso-gsm0710muxd"
+RDEPENDS_${PN}-append-om-3d7k  = " fso-abyss"
 # - add wmiconfig for wireless configuration
 RDEPENDS_${PN}_append_om-gta02 = " wmiconfig"
 
-- 
cgit v1.2.3