[oe-commits] org.oe.dev frameworkd git update revision to ms3 RC1, catch up framework configurations

[mickeyl commit]

frameworkd git update revision to ms3 RC1, catch up framework configurations

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 87d13abecb09be358ba331b4193cf76bdd2bda3d
ViewMTN: http://monotone.openembedded.org/revision/info/87d13abecb09be358ba331b4193cf76bdd2bda3d
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/frameworkd/a780/frameworkd.conf
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd/magician/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
Diffs:

#
# mt diff -r93298a4b7addcb55df760ebbb5bf9dcaead9b965 -r87d13abecb09be358ba331b4193cf76bdd2bda3d
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [c8c33b6eb98daedf3de99ee5ba7bee2199f7704c]
#    to [4f99de2a0c9d2189fd884f2aa9e6803cea686dc0]
# 
# patch "packages/freesmartphone/frameworkd/a780/frameworkd.conf"
#  from [42f71b59097f81bae168195d85209063cb92c1f4]
#    to [2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee]
# 
# patch "packages/freesmartphone/frameworkd/frameworkd.conf"
#  from [31582e7207f59cfd9b6570cbe36f2df59f587eab]
#    to [7f5e3940479f66844a28668a1161f2b664e1079e]
# 
# patch "packages/freesmartphone/frameworkd/magician/frameworkd.conf"
#  from [956fbca634e435124be4f323573306632e11f8eb]
#    to [6c951b8c68fd4a7515677bb251edcee52648e04c]
# 
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
#  from [aaa2ede39c269671da1b463d943cda006ff393cf]
#    to [b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6]
# 
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
#  from [519709aafcf5d15f5d178fc7e95869b9214bed78]
#    to [a0b3e8d263d2f7a745291efc50eab5ddafea8d8c]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [500c5a7db116c70138d4188704cb83417b655625]
#    to [fb0260924225b0c8aa28c4ec9290819c11e7f543]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	c8c33b6eb98daedf3de99ee5ba7bee2199f7704c
+++ conf/distro/include/sane-srcrevs.inc	4f99de2a0c9d2189fd884f2aa9e6803cea686dc0
@@ -37,7 +37,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b"
+SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
============================================================
--- packages/freesmartphone/frameworkd/a780/frameworkd.conf	42f71b59097f81bae168195d85209063cb92c1f4
+++ packages/freesmartphone/frameworkd/a780/frameworkd.conf	2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee
@@ -1,4 +1,5 @@
-[idlenotifier]
+[frameworkd]
+version = 1
 
 [input]
 # keys (copied from Openmoko, need to adjust)
@@ -13,3 +14,7 @@ rootdir = ../etc/freesmartphone/oprefere
 
 [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
+
============================================================
--- packages/freesmartphone/frameworkd/frameworkd.conf	31582e7207f59cfd9b6570cbe36f2df59f587eab
+++ packages/freesmartphone/frameworkd/frameworkd.conf	7f5e3940479f66844a28668a1161f2b664e1079e
@@ -1,17 +1,18 @@
-[odeviced]
+[frameworkd]
+version = 1
 
-[kernel26]
+[odeviced.kernel26]
 # set 1 to disable the module
 disable = 0
 
-[idlenotifier]
+[odeviced.idlenotifier]
 # set 1 to disable the module
 disable = 0
-# add inut nodes to ignore for idle activity
+# add input nodes to ignore for idle activity
 ignoreinput = 2,3,4
 
-[powercontrol-neo]
-disable = 0
+[odeviced.powercontrol-neo]
+disable = 1
 
 [ogsmd]
 # specify your modemtype here
@@ -19,3 +20,6 @@ rootdir = ../etc/freesmartphone/oprefere
 
 [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
============================================================
--- packages/freesmartphone/frameworkd/magician/frameworkd.conf	956fbca634e435124be4f323573306632e11f8eb
+++ packages/freesmartphone/frameworkd/magician/frameworkd.conf	6c951b8c68fd4a7515677bb251edcee52648e04c
@@ -1,6 +1,7 @@
-[idlenotifier]
+[frameworkd]
+version = 1
 
-[input]
+[odeviced.input]
 # magician doesn't have AUX, use the CAMERA key for now
 # (it's in about the same place as AUX on gta01/02)
 report1 = AUX,key,212,1
@@ -9,9 +10,13 @@ report4 = HEADSET,switch,2,0
 report3 = CHARGER,key,356,0
 report4 = HEADSET,switch,2,0
 
-[ophoned]
+[ogsmd]
 # Magician has TI Calypso
 modemtype = ti_calypso
 
 [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
+
============================================================
--- packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf	aaa2ede39c269671da1b463d943cda006ff393cf
+++ packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf	b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6
@@ -1,6 +1,13 @@
-[idlenotifier]
+[frameworkd]
+version = 1
 
-[input]
+[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
@@ -18,3 +25,6 @@ rootdir = ../etc/freesmartphone/oprefere
 
 [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
============================================================
--- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	519709aafcf5d15f5d178fc7e95869b9214bed78
+++ packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	a0b3e8d263d2f7a745291efc50eab5ddafea8d8c
@@ -1,13 +1,19 @@
-[idlenotifier]
+[frameworkd]
+version = 1
+
+[odeviced.audio]
+# set default alsa scenario
+default_scenario = stereoout
+# set path to alsa scenario files
+scenario_dir = /usr/share/openmoko/scenarios
+
+[odeviced.idlenotifier]
 # don't read from accellerometers for GTA02
 ignoreinput=2,3
 
-[input]
+[odeviced.input]
 # don't read from accellerometers for GTA02
 ignoreinput=2,3
-
-# specify accellerometer type
-accelerometer_type = gta02
 # keys
 report1 = AUX,key,169,1
 report2 = POWER,key,116,1
@@ -15,8 +21,9 @@ report4 = HEADSET,switch,2,0
 report4 = HEADSET,switch,2,0
 
 # disable accelerometer since it uses LOADS of CPU resources
-[accelerometer]
+[odeviced.accelerometer]
 disable = 1
+accelerometer_type = gta02
 
 [ogsmd]
 # GTA02 has TI Calypso
@@ -29,3 +36,7 @@ rootdir = ../etc/freesmartphone/oprefere
 
 [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
+
============================================================
--- packages/freesmartphone/frameworkd_git.bb	500c5a7db116c70138d4188704cb83417b655625
+++ packages/freesmartphone/frameworkd_git.bb	fb0260924225b0c8aa28c4ec9290819c11e7f543
@@ -37,7 +37,14 @@ RDEPENDS_${PN} += "\
   ${PN}-config \
 "
 
+RRECOMMENDS_${PN} += "\
+  alsa-utils-amixer \
+  ppp \
+"
 
+RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd"
+RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd"
+
 PACKAGES =+ "${PN}-config"
 
 PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"