freesmartphone: catch up with milestone5.5 and SHR/import

51 files changed, 1130 insertions, 302 deletions

diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index c3bf018369..17da17cb08 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -2,14 +2,25 @@ DESCRIPTION = "The freesmartphone.org API reference implementation (FSO 2.0)"
 AUTHOR = "Team FSO"
 LICENSE = "LGPL"
 SECTION = "devel"
-DEPENDS = "vala-native glib-2.0 dbus dbus-glib"
-PV = "0.0.0.0+gitr${SRCREV}"
+DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee"
+DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics misc-vapi'.split())]}"
+PV = "invalid, please override"
+INC_PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
 S = "${WORKDIR}/git/${PN}"
 
 inherit autotools_stage pkgconfig vala
 
-FILES_${PN} += "${sysconfdir} ${datadir}"
-# ship vapi files
-FILES_${PN}-dev += "${datadir}/vala"
+FILES_${PN} += "\
+  ${sysconfdir} \
+  ${datadir}\${PN} \
+  ${datadir}/dbus-1 \
+  ${libdir}/cornucopia/modules/*/lib*.so \
+"
+FILES_${PN}-dev += "\
+  ${libdir}/cornucopia/modules/*/lib*.la \
+"
+FILES_${PN}-dbg += "\
+  ${libdir}/cornucopia/modules/*/.debug \
+"
diff --git a/recipes/freesmartphone/dbus-hlid_git.bb b/recipes/freesmartphone/dbus-hlid_git.bb
index 79bada1396..508cf874c6 100644
--- a/recipes/freesmartphone/dbus-hlid_git.bb
+++ b/recipes/freesmartphone/dbus-hlid_git.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "High Level DBus Introspection Daemon"
-AUTHOR = "M. Lauer et. al."
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/DbusHlid"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib"
 LICENSE = "GPL"
-PV = "0.9.0+gitr${SRCREV}"
+PV = "1.0.1+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/dbus-hlid.git;protocol=git;branch=master"
diff --git a/recipes/freesmartphone/frameworkd-devel_git.bb b/recipes/freesmartphone/frameworkd-devel_git.bb
deleted file mode 100644
index a6439ee653..0000000000
--- a/recipes/freesmartphone/frameworkd-devel_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require frameworkd_git.bb
-FILESPATHPKG =. "frameworkd:"
-PROVIDES = "frameworkd"
-RPROVIDES = "frameworkd"
-PV = "0.8.5.x+gitr${SRCREV}"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=mickey/ogsmd-new-timeout \
-  file://frameworkd \
-  file://frameworkd.conf \
-"
diff --git a/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf b/recipes/freesmartphone/frameworkd/a780/frameworkd.conf
index 36359a9f34..d50d498ab0 100644
--- a/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/a780/frameworkd.conf
@@ -20,3 +20,10 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
 
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf b/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf
index 3581064245..463caf6ae9 100644
--- a/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf
@@ -36,3 +36,11 @@ rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevent
 
 [opimd]
 disable = 1
+
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/frameworkd b/recipes/freesmartphone/frameworkd/frameworkd
index 08b782e402..63d6a79475 100644
--- a/recipes/freesmartphone/frameworkd/frameworkd
+++ b/recipes/freesmartphone/frameworkd/frameworkd
@@ -32,7 +32,7 @@ case "$1" in
         $0 start
         ;;
     *)
-        echo "Usage: /etc/init.d/odeviced {start|stop|restart|force-reload}"
+        echo "Usage: /etc/init.d/frameworkd {start|stop|restart|force-reload}"
         exit 1
         ;;
 esac
diff --git a/recipes/freesmartphone/frameworkd/frameworkd.conf b/recipes/freesmartphone/frameworkd/frameworkd.conf
index 39e60d632b..7748740b4a 100644
--- a/recipes/freesmartphone/frameworkd/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/frameworkd.conf
@@ -25,3 +25,10 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
diff --git a/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf b/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf
deleted file mode 100644
index a50172c7f5..0000000000
--- a/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf
+++ /dev/null
@@ -1,152 +0,0 @@
-[frameworkd]
-# indicates this configuration version, do not change
-version = 1
-# the default log_level, if not specified per module
-log_level = INFO
-# the global log_destination. Uncomment to enable
-log_to = stderr
-#log_to = file
-#log_to = syslog
-# if logging to a file, specify the destination
-log_destination = /tmp/frameworkd.log
-# persistance format, one of "pickle", "yaml"
-persist_format = pickle
-rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone
-# specify how subsystems scan for their plugins,
-# either "auto" (via filesystem scan) or "config" (via config section check)
-# the default is "auto" (slow).
-scantype = auto
-
-#
-# Subsystem configuration for oeventsd
-#
-[odeviced]
-# set log level for a subsystem or for an individual module
-# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
-log_level = INFO
-
-[odeviced.accelerometer]
-disable = 1
-
-[odeviced.audio]
-# set directory where the alsa audio scenarios are stored
-scenario_dir = /usr/share/openmoko/scenarios
-# set default scenario loaded at startup
-default_scenario = stereoout
-
-[odeviced.idlenotifier]
-# configure timeouts (in seconds) here. A value of 0
-# means 'never fall into this state' (except programatically)
-idle = 10
-idle_dim = 20
-idle_prelock = 12
-lock = 2
-suspend = 2
-
-[odeviced.input]
-# format is <keyname>,<type>,<input device keycode>,<report held seconds in addition to press/release>
-report1 = AUX,key,169,1
-report2 = POWER,key,116,1
-report3 = CHARGER,key,356,0
-report4 = HEADSET,switch,2,0
-
-[odeviced.kernel26]
-# set 1 to disable a module
-disable = 0
-# poll capacity once every 5 minutes
-# (usually, you do not have to change this)
-capacity_check_timeout = 300
-# set 0 to disable FB_BLANK ioctl to blank framebuffer
-# (if you have problems on Openmoko GTA02)
-fb_blank = 1
-
-[odeviced.powercontrol_ibm]
-disable = 1
-
-[odeviced.powercontrol_neo]
-disable = 1
-
-#
-# Subsystem configuration for oeventsd
-#
-[oeventsd]
-log_level = DEBUG
-disable = 0
-
-[oeventsd.oevents]
-
-#
-# Subsystem configuration for ogspd
-#
-[ogpsd]
-# possible options are NMEADevice, UBXDevice, GTA02Device, EtenDevice
-device = GTA02Device
-# possible options are SerialChannel, GllinChannel, UDPChannel, FileChannel
-channel = SerialChannel
-# For UDPChannel the path defines the port to listen to
-path = /dev/ttySAC1
-log_level = INFO
-
-[ogpsd.factory]
-
-#
-# Subsystem configuration for ogsmd
-#
-[ogsmd]
-disable = 0
-modemtype = qualcomm_msm
-
-#
-# Subsystem configuration for onetworkd
-#
-[onetworkd]
-
-[onetworkd.network]
-
-#
-# Subsystem configuration for ophoned
-#
-[ophoned]
-
-[ophoned.ophoned]
-
-#
-# Subsystem configuration for opimd
-#
-[opimd]
-contacts_default_backend = CSV-Contacts
-messages_default_folder = Unfiled
-messages_trash_folder = Trash
-sim_messages_default_folder = SMS
-rootdir = ../etc/freesmartphone/opim:/etc/freesmartphone/opim:/usr/etc/freesmartphone/opim
-
-[opimd.opimd]
-
-#
-# Subsystem configuration for opreferencesd
-#
-[opreferencesd]
-log_level = DEBUG
-disable = 0
-# log_level = DEBUG
-
-[opreferencesd.opreferences]
-
-#
-# Subsystem configuration for otimed
-#
-[otimed]
-# a list of time/zone sources to use or NONE
-timesources = GPS,NTP
-zonesources = GSM
-
-[otimed.otimed]
-
-#
-# Subsystem configuration for ousaged
-#
-[ousaged]
-# choose whether resources should be disabled at startup, at shutdown, always (default), or never.
-sync_resources_with_lifecycle = always
-
-[ousaged.generic]
diff --git a/recipes/freesmartphone/frameworkd/magician/frameworkd.conf b/recipes/freesmartphone/frameworkd/magician/frameworkd.conf
index eb22030550..e8f6606b5b 100644
--- a/recipes/freesmartphone/frameworkd/magician/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/magician/frameworkd.conf
@@ -22,3 +22,10 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
 
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf
deleted file mode 100644
index d48bc0815c..0000000000
--- a/recipes/freesmartphone/frameworkd/om-3d7k/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/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf
index b2a817aa66..89ff0a627f 100644
--- a/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf
@@ -31,3 +31,11 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf
index 796d4fb88a..7ffe9d8a7d 100644
--- a/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf
@@ -46,3 +46,10 @@ rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevent
 [opimd]
 disable = 1
 
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index d658fd092a..130fe55231 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.5.2+gitr${SRCREV}"
+PV = "0.9.5.9+gitr${SRCREV}"
 PR = "r0"
 
 inherit distutils update-rc.d
@@ -14,7 +14,8 @@ INITSCRIPT_PARAMS = "defaults 29"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
            file://frameworkd \
-           file://frameworkd.conf"
+           file://frameworkd.conf \
+	   "
 S = "${WORKDIR}/git"
 
 do_configure_append() {
@@ -28,12 +29,17 @@ do_install_append() {
 }
 
 RDEPENDS_${PN} += "\
+  fsousaged \
+"
+
+RDEPENDS_${PN} += "\
   python-ctypes \
   python-dbus \
   python-datetime \
   python-difflib \
   python-logging \
   python-pprint \
+  python-pyalsaaudio \
   python-pygobject \
   python-pyrtc \
   python-pyserial \
@@ -42,7 +48,7 @@ RDEPENDS_${PN} += "\
   python-subprocess \
   python-syslog \
   python-textutils \
-  \
+  python-multiprocessing \
   ${PN}-config \
 "
 
@@ -52,16 +58,15 @@ RRECOMMENDS_${PN} += "\
   ppp \
 "
 
+PACKAGES =+ "${PN}-config"
+PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"
+
 # machine specific stuff, should ideally be elsewhere
 # - 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"
+RDEPENDS_${PN}-config_append_om-gta01 = " fso-abyss"
+RDEPENDS_${PN}-config_append_om-gta02 = " fso-abyss"
 # - add wmiconfig for wireless configuration
-RDEPENDS_${PN}_append_om-gta02 = " wmiconfig"
-
-PACKAGES =+ "${PN}-config"
-PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"
+RDEPENDS_${PN}-config_append_om-gta02 = " wmiconfig"
 
 FILES_${PN}-config = "\
   ${sysconfdir}/frameworkd.conf \
diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb
index 2b2660c1f7..52e78bc0d7 100644
--- a/recipes/freesmartphone/fso-abyss_git.bb
+++ b/recipes/freesmartphone/fso-abyss_git.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon"
-HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/fso-abyss"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "dbus dbus-glib libgsm0710mux"
+DEPENDS = "vala-native dbus dbus-glib libgsm0710mux"
 LICENSE = "GPL"
-PV = "0.3.3+gitr${SRCREV}"
+PV = "0.3.6+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "\
@@ -12,6 +12,6 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-inherit autotools vala
+inherit autotools
 
 FILES_${PN} += "${datadir}"
diff --git a/recipes/freesmartphone/fso-alsa-data.bb b/recipes/freesmartphone/fso-alsa-data.bb
new file mode 100644
index 0000000000..e25c0a0db1
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "freesmartphone.org Alsa data files"
+LICENSE = "MIT"
+PV = "0.1.0"
+PR = "r0"
+
+SRC_URI = "\
+  file://default \
+  file://default.conf \
+"
+
+do_install() {
+	install -d ${D}${sysconfdir}/freesmartphone/alsa/default/
+	# master conf
+	install -m 0644 ${WORKDIR}/default.conf ${D}${sysconfdir}/freesmartphone/alsa/
+	# scenarii
+	install -m 0644 ${WORKDIR}/default/* ${D}${sysconfdir}/freesmartphone/alsa/default/
+}
+
+FILES_${PN} = "\
+	${sysconfdir} \
+"
diff --git a/recipes/freesmartphone/fso-alsa-data/default.conf b/recipes/freesmartphone/fso-alsa-data/default.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/default.conf
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default.conf b/recipes/freesmartphone/fso-alsa-data/om-gta02/default.conf
new file mode 100644
index 0000000000..b64f70ffe0
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default.conf
@@ -0,0 +1,21 @@
+[alsa]
+cardname = default
+default = scenario.stereoout
+
+# GSM
+[scenario.voiphandset]
+
+[scenario.gsmspeaker]
+
+[scenario.gsmheadset]
+
+[scenario.gsmhandset]
+
+[scenario.gsmbluetooth]
+
+[scenario.capturehandset]
+
+# PCM
+[scenario.stereoout]
+
+[scenario.headset]
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/capturehandset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/capturehandset
new file mode 100644
index 0000000000..8996833499
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/capturehandset
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:255,255
+2:'ADC Capture Volume':2:195,195
+3:'Headphone Playback Volume':2:121,121
+4:'Speaker Playback Volume':2:121,121
+5:'Mono Playback Volume':1:121
+6:'Bypass Playback Volume':2:2,2
+7:'Sidetone Playback Volume':2:2,2
+8:'Voice Playback Volume':2:2,2
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:2
+12:'Mono Sidetone Playback Volume':1:2
+13:'Mono Voice Playback Volume':1:2
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:7
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:2,2
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:23,23
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:1,1
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:1
+28:'ALC Capture Target Volume':1:3
+29:'ALC Capture Max Volume':1:7
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:15
+33:'ALC Capture Decay Time':1:12
+34:'ALC Capture Attack Time':1:2
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:0
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:3
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:2
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:0
+58:'Line Left Mux':1:0
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:1
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:0
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:1
+67:'Capture Left Mixer':1:1
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:0
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:0
+82:'Right Mixer Bypass Playback Swi':1:0
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:0
+86:'Left Mixer Bypass Playback Swit':1:0
+87:'DAPM Stereo Out Switch':1:0
+88:'DAPM GSM Line Out Switch':1:1
+89:'DAPM GSM Line In Switch':1:1
+90:'DAPM Headset Mic Switch':1:1
+91:'DAPM Handset Mic Switch':1:1
+92:'DAPM Handset Spk Switch':1:1
+93:'Amp State Switch':1:1
+94:'Amp Spk Switch':1:1
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmbluetooth b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmbluetooth
new file mode 100644
index 0000000000..27a9b7df07
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmbluetooth
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:235,235
+2:'ADC Capture Volume':2:195,195
+3:'Headphone Playback Volume':2:0,0
+4:'Speaker Playback Volume':2:0,0
+5:'Mono Playback Volume':1:79
+6:'Bypass Playback Volume':2:6,6
+7:'Sidetone Playback Volume':2:6,6
+8:'Voice Playback Volume':2:7,7
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:5
+12:'Mono Sidetone Playback Volume':1:5
+13:'Mono Voice Playback Volume':1:4
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:8
+18:'Treble Volume':1:8
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:0,0
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:48,48
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:1,1
+25:'Capture Filter Select':1:2
+26:'Capture Filter Cut-off':1:1
+27:'Capture Filter Switch':1:1
+28:'ALC Capture Target Volume':1:4
+29:'ALC Capture Max Volume':1:5
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:4
+33:'ALC Capture Decay Time':1:8
+34:'ALC Capture Attack Time':1:2
+35:'ALC Capture NG Threshold':1:7
+36:'ALC Capture NG Type':1:0
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:8
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:3
+49:'Mic1 Capture Volume':1:3
+50:'DAI Mode':1:0
+51:'ADC Data Select':1:1
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:1
+56:'Line Mono Mux':1:1
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:0
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:1
+63:'Mic Sidetone Mux':1:0
+64:'Capture Right Mux':1:2
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:1
+67:'Capture Left Mixer':1:1
+68:'Playback Mixer Voice Capture Sw':1:1
+69:'Playback Mixer Left Capture Swi':1:1
+70:'Playback Mixer Right Capture Sw':1:1
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:1
+77:'Mono Mixer Sidetone Playback Sw':1:0
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:0
+82:'Right Mixer Bypass Playback Swi':1:0
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:0
+86:'Left Mixer Bypass Playback Swit':1:0
+87:'DAPM Stereo Out Switch':1:0
+88:'DAPM GSM Line Out Switch':1:1
+89:'DAPM GSM Line In Switch':1:1
+90:'DAPM Headset Mic Switch':1:0
+91:'DAPM Handset Mic Switch':1:0
+92:'DAPM Handset Spk Switch':1:1
+93:'Amp State Switch':1:0
+94:'Amp Spk Switch':1:0
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmhandset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmhandset
new file mode 100644
index 0000000000..5c3b8b4b85
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmhandset
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:0,0
+2:'ADC Capture Volume':2:0,0
+3:'Headphone Playback Volume':2:0,0
+4:'Speaker Playback Volume':2:127,127
+5:'Mono Playback Volume':1:110
+6:'Bypass Playback Volume':2:7,7
+7:'Sidetone Playback Volume':2:0,0
+8:'Voice Playback Volume':2:0,0
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:0
+12:'Mono Sidetone Playback Volume':1:7
+13:'Mono Voice Playback Volume':1:0
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:0
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:0,0
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:0,0
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:1,1
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:0
+28:'ALC Capture Target Volume':1:0
+29:'ALC Capture Max Volume':1:0
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:0
+33:'ALC Capture Decay Time':1:0
+34:'ALC Capture Attack Time':1:0
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:1
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:3
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:0
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:1
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:2
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:0
+67:'Capture Left Mixer':1:0
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:1
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:0
+82:'Right Mixer Bypass Playback Swi':1:1
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:0
+86:'Left Mixer Bypass Playback Swit':1:1
+87:'DAPM Stereo Out Switch':1:0
+88:'DAPM GSM Line Out Switch':1:1
+89:'DAPM GSM Line In Switch':1:1
+90:'DAPM Headset Mic Switch':1:1
+91:'DAPM Handset Mic Switch':1:1
+92:'DAPM Handset Spk Switch':1:1
+93:'Amp State Switch':1:0
+94:'Amp Spk Switch':1:0
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmheadset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmheadset
new file mode 100644
index 0000000000..a5875a8b8f
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmheadset
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:0,0
+2:'ADC Capture Volume':2:0,0
+3:'Headphone Playback Volume':2:96,96
+4:'Speaker Playback Volume':2:0,0
+5:'Mono Playback Volume':1:103
+6:'Bypass Playback Volume':2:7,7
+7:'Sidetone Playback Volume':2:0,0
+8:'Voice Playback Volume':2:0,0
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:0
+12:'Mono Sidetone Playback Volume':1:5
+13:'Mono Voice Playback Volume':1:0
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:0
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:0,0
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:0,0
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:1,1
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:0
+28:'ALC Capture Target Volume':1:0
+29:'ALC Capture Max Volume':1:0
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:0
+33:'ALC Capture Decay Time':1:0
+34:'ALC Capture Attack Time':1:0
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:1
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:0
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:0
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:1
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:1
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:0
+67:'Capture Left Mixer':1:0
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:1
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:0
+82:'Right Mixer Bypass Playback Swi':1:1
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:0
+86:'Left Mixer Bypass Playback Swit':1:1
+87:'DAPM Stereo Out Switch':1:1
+88:'DAPM GSM Line Out Switch':1:1
+89:'DAPM GSM Line In Switch':1:1
+90:'DAPM Headset Mic Switch':1:1
+91:'DAPM Handset Mic Switch':1:1
+92:'DAPM Handset Spk Switch':1:0
+93:'Amp State Switch':1:1
+94:'Amp Spk Switch':1:0
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmspeaker b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmspeaker
new file mode 100644
index 0000000000..36c3f8f400
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmspeaker
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:0,0
+2:'ADC Capture Volume':2:0,0
+3:'Headphone Playback Volume':2:127,127
+4:'Speaker Playback Volume':2:0,0
+5:'Mono Playback Volume':1:103
+6:'Bypass Playback Volume':2:7,7
+7:'Sidetone Playback Volume':2:0,0
+8:'Voice Playback Volume':2:0,0
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:0
+12:'Mono Sidetone Playback Volume':1:6
+13:'Mono Voice Playback Volume':1:0
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:0
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:0,0
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:0,0
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:1,1
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:0
+28:'ALC Capture Target Volume':1:0
+29:'ALC Capture Max Volume':1:0
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:0
+33:'ALC Capture Decay Time':1:0
+34:'ALC Capture Attack Time':1:0
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:1
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:0
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:0
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:1
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:2
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:0
+67:'Capture Left Mixer':1:0
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:1
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:0
+82:'Right Mixer Bypass Playback Swi':1:1
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:0
+86:'Left Mixer Bypass Playback Swit':1:1
+87:'DAPM Stereo Out Switch':1:1
+88:'DAPM GSM Line Out Switch':1:1
+89:'DAPM GSM Line In Switch':1:1
+90:'DAPM Headset Mic Switch':1:1
+91:'DAPM Handset Mic Switch':1:1
+92:'DAPM Handset Spk Switch':1:1
+93:'Amp State Switch':1:1
+94:'Amp Spk Switch':1:1
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/headset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/headset
new file mode 100644
index 0000000000..ddd1e44742
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/headset
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:235,235
+2:'ADC Capture Volume':2:195,195
+3:'Headphone Playback Volume':2:127,127
+4:'Speaker Playback Volume':2:0,0
+5:'Mono Playback Volume':1:121
+6:'Bypass Playback Volume':2:2,2
+7:'Sidetone Playback Volume':2:2,2
+8:'Voice Playback Volume':2:2,2
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:2
+12:'Mono Sidetone Playback Volume':1:2
+13:'Mono Voice Playback Volume':1:2
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:0
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:2,2
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:23,23
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:0,0
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:1
+28:'ALC Capture Target Volume':1:3
+29:'ALC Capture Max Volume':1:7
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:15
+33:'ALC Capture Decay Time':1:12
+34:'ALC Capture Attack Time':1:2
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:0
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:0
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:0
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:0
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:0
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:0
+67:'Capture Left Mixer':1:0
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:0
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:1
+82:'Right Mixer Bypass Playback Swi':1:0
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:1
+86:'Left Mixer Bypass Playback Swit':1:0
+87:'DAPM Stereo Out Switch':1:1
+88:'DAPM GSM Line Out Switch':1:0
+89:'DAPM GSM Line In Switch':1:0
+90:'DAPM Headset Mic Switch':1:0
+91:'DAPM Handset Mic Switch':1:0
+92:'DAPM Handset Spk Switch':1:0
+93:'Amp State Switch':1:1
+94:'Amp Spk Switch':1:0
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/stereoout b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/stereoout
new file mode 100644
index 0000000000..d621263b41
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/stereoout
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:235,235
+2:'ADC Capture Volume':2:195,195
+3:'Headphone Playback Volume':2:127,127
+4:'Speaker Playback Volume':2:0,0
+5:'Mono Playback Volume':1:121
+6:'Bypass Playback Volume':2:2,2
+7:'Sidetone Playback Volume':2:2,2
+8:'Voice Playback Volume':2:2,2
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:2
+12:'Mono Sidetone Playback Volume':1:2
+13:'Mono Voice Playback Volume':1:2
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:0
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:2,2
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:23,23
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:0,0
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:1
+28:'ALC Capture Target Volume':1:3
+29:'ALC Capture Max Volume':1:7
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:15
+33:'ALC Capture Decay Time':1:12
+34:'ALC Capture Attack Time':1:2
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:0
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:0
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:0
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:0
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:0
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:0
+67:'Capture Left Mixer':1:0
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:0
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:1
+82:'Right Mixer Bypass Playback Swi':1:0
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:1
+86:'Left Mixer Bypass Playback Swit':1:0
+87:'DAPM Stereo Out Switch':1:1
+88:'DAPM GSM Line Out Switch':1:0
+89:'DAPM GSM Line In Switch':1:0
+90:'DAPM Headset Mic Switch':1:0
+91:'DAPM Handset Mic Switch':1:0
+92:'DAPM Handset Spk Switch':1:0
+93:'Amp State Switch':1:1
+94:'Amp Spk Switch':1:1
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default/voiphandset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/voiphandset
new file mode 100644
index 0000000000..3ca0f86e88
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/voiphandset
@@ -0,0 +1,94 @@
+1:'PCM Volume':2:235,235
+2:'ADC Capture Volume':2:195,195
+3:'Headphone Playback Volume':2:127,127
+4:'Speaker Playback Volume':2:0,0
+5:'Mono Playback Volume':1:121
+6:'Bypass Playback Volume':2:2,2
+7:'Sidetone Playback Volume':2:2,2
+8:'Voice Playback Volume':2:2,2
+9:'Headphone Playback ZC Switch':2:0,0
+10:'Speaker Playback ZC Switch':2:0,0
+11:'Mono Bypass Playback Volume':1:2
+12:'Mono Sidetone Playback Volume':1:2
+13:'Mono Voice Playback Volume':1:2
+14:'Mono Playback ZC Switch':1:0
+15:'Bass Boost':1:0
+16:'Bass Filter':1:0
+17:'Bass Volume':1:0
+18:'Treble Volume':1:0
+19:'Treble Cut-off':1:0
+20:'Sidetone Capture Volume':2:2,2
+21:'Voice Sidetone Capture Volume':1:2
+22:'Capture Volume':2:47,47
+23:'Capture ZC Switch':2:0,0
+24:'Capture Switch':2:1,1
+25:'Capture Filter Select':1:0
+26:'Capture Filter Cut-off':1:0
+27:'Capture Filter Switch':1:1
+28:'ALC Capture Target Volume':1:3
+29:'ALC Capture Max Volume':1:7
+30:'ALC Capture Function':1:0
+31:'ALC Capture ZC Switch':1:0
+32:'ALC Capture Hold Time':1:15
+33:'ALC Capture Decay Time':1:12
+34:'ALC Capture Attack Time':1:2
+35:'ALC Capture NG Threshold':1:0
+36:'ALC Capture NG Type':1:0
+37:'ALC Capture NG Switch':1:0
+38:'3D Function':1:0
+39:'3D Upper Cut-off':1:0
+40:'3D Lower Cut-off':1:0
+41:'3D Volume':1:0
+42:'3D Switch':1:0
+43:'Capture 6dB Attenuate':1:0
+44:'Playback 6dB Attenuate':1:0
+45:'De-emphasis':1:0
+46:'Playback Mono Mix':1:0
+47:'Playback Phase':1:0
+48:'Mic2 Capture Volume':1:2
+49:'Mic1 Capture Volume':1:0
+50:'DAI Mode':1:2
+51:'ADC Data Select':1:0
+52:'ROUT2 Phase':1:1
+53:'Mic Selection Mux':1:0
+54:'Rx Mixer':1:0
+55:'Line Mixer':1:0
+56:'Line Mono Mux':1:0
+57:'Line Right Mux':1:1
+58:'Line Left Mux':1:1
+59:'ALC Mixer Line Capture Switch':1:0
+60:'ALC Mixer Mic2 Capture Switch':1:0
+61:'ALC Mixer Mic1 Capture Switch':1:0
+62:'ALC Mixer Rx Capture Switch':1:0
+63:'Mic Sidetone Mux':1:0
+64:'Capture Right Mux':1:0
+65:'Capture Left Mux':1:0
+66:'Capture Right Mixer':1:2
+67:'Capture Left Mixer':1:2
+68:'Playback Mixer Voice Capture Sw':1:0
+69:'Playback Mixer Left Capture Swi':1:0
+70:'Playback Mixer Right Capture Sw':1:0
+71:'Out4 Mux':1:0
+72:'Out3 Mux':1:0
+73:'Mono 2 Mux':1:0
+74:'Mono Mixer Left Playback Switch':1:0
+75:'Mono Mixer Right Playback Switc':1:0
+76:'Mono Mixer Voice Playback Switc':1:0
+77:'Mono Mixer Sidetone Playback Sw':1:0
+78:'Mono Mixer Bypass Playback Swit':1:0
+79:'Right Mixer Voice Playback Swit':1:0
+80:'Right Mixer Sidetone Playback S':1:0
+81:'Right Mixer Right Playback Swit':1:1
+82:'Right Mixer Bypass Playback Swi':1:0
+83:'Left Mixer Voice Playback Switc':1:0
+84:'Left Mixer Sidetone Playback Sw':1:0
+85:'Left Mixer Left Playback Switch':1:1
+86:'Left Mixer Bypass Playback Swit':1:0
+87:'DAPM Stereo Out Switch':1:0
+88:'DAPM GSM Line Out Switch':1:0
+89:'DAPM GSM Line In Switch':1:0
+90:'DAPM Headset Mic Switch':1:0
+91:'DAPM Handset Mic Switch':1:1
+92:'DAPM Handset Spk Switch':1:1
+93:'Amp State Switch':1:1
+94:'Amp Spk Switch':1:1
diff --git a/recipes/freesmartphone/fso-monitord_git.bb b/recipes/freesmartphone/fso-monitord_git.bb
index c7bbbe06c1..a13456dcfd 100644
--- a/recipes/freesmartphone/fso-monitord_git.bb
+++ b/recipes/freesmartphone/fso-monitord_git.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "FSO monitor daemon"
+AUTHOR = "M. Lauer et. al."
 SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib"
 LICENSE = "GPL"
-PV = "0.2.0+gitr${SRCREV}"
+PV = "0.0.0+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master"
diff --git a/recipes/freesmartphone/fso-sounds.bb b/recipes/freesmartphone/fso-sounds.bb
index 5ee60e19d6..3277692c57 100644
--- a/recipes/freesmartphone/fso-sounds.bb
+++ b/recipes/freesmartphone/fso-sounds.bb
@@ -1,18 +1,17 @@
 DESCRIPTION = "A set of notification sounds"
-LICENSE = "PD"
+LICENSE = "CC"
 SECTION = "multimedia"
 PV = "0.0.1+gitr${SRCREV}"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "\
-  http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid \
   ${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master \
 "
 
 do_install() {
 	install -d ${D}${datadir}/sounds/
-	install ${WORKDIR}/*.sid ${D}${datadir}/sounds/
-	install ${WORKDIR}/git/sounds/*.mp3 ${D}${datadir}/sounds/
+	install ${WORKDIR}/git/sounds/female_message.wav ${D}${datadir}/sounds/
+	install ${WORKDIR}/git/sounds/female_ringtone.wav ${D}${datadir}/sounds/
 }
 
 FILES_${PN} = "${datadir}"
diff --git a/recipes/freesmartphone/fso-specs_git.bb b/recipes/freesmartphone/fso-specs_git.bb
new file mode 100644
index 0000000000..b346fb54cb
--- /dev/null
+++ b/recipes/freesmartphone/fso-specs_git.bb
@@ -0,0 +1,21 @@
+DESCRIPTIONS = "API Specification for freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer"
+HOMEPAGE = "http://docs.freesmartphone.org"
+LICENSE = "BSD"
+SECTION = "devel/specifications"
+PV = "0.0.1-gitr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/specs.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+do_compile() {
+	make xml
+}
+
+do_stage() {
+	install -d "${STAGING_DATADIR}/fso-specs"
+	install -m 0644 xml/* "${STAGING_DATADIR}/fso-specs"
+}
+
+FILE_${PN}-dev += "${datadir}/fso-specs"
diff --git a/recipes/freesmartphone/fso-term_git.bb b/recipes/freesmartphone/fso-term_git.bb
index 22e74d3795..e3f674d7cb 100644
--- a/recipes/freesmartphone/fso-term_git.bb
+++ b/recipes/freesmartphone/fso-term_git.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "FSO Term is a versatile muxer-aware terminal program"
+DESCRIPTION = "Term is a versatile muxer-aware terminal program"
 HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/fso-term"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "dbus dbus-glib readline libfsotransport"
+DEPENDS = "dbus dbus-glib readline libfsoframework"
 LICENSE = "GPL"
 PV = "0.0.0.0+gitr${SRCREV}"
 PR = "r0"
diff --git a/recipes/freesmartphone/fsod/autofoo.patch b/recipes/freesmartphone/fsod/autofoo.patch
deleted file mode 100644
index 3ed26aeb79..0000000000
--- a/recipes/freesmartphone/fsod/autofoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fsod/configure.ac
-===================================================================
---- fsod/configure.ac
-+++ ~fsod/configure.ac
-@@ -85,7 +85,7 @@ if test "x$have_python" != "xno"; then
- 	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
- 	PYTHON_LIBS="-lpython$PYTHON_VERSION"
- 	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
--	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
-+	PYTHON_CFLAGS="${PYTHON_INCLUDES}" # "-I`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_inc()'`"
- 	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
- 	PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
- 	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
diff --git a/recipes/freesmartphone/fsod_git.bb b/recipes/freesmartphone/fsod_git.bb
deleted file mode 100644
index c0af2cace3..0000000000
--- a/recipes/freesmartphone/fsod_git.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "The C/Vala implementation of the freesmartphone.org framework APIs"
-HOMEPAGE = "http://www.freesmartphone.org/"
-AUTHOR = "Sudharshan S"
-SECTION = "console/network"
-DEPENDS = "dbus dbus-glib libnl vala-native"
-# for pygobject-codegen
-DEPENDS += "python-pygtk"
-LICENSE = "LGPL"
-PV = "0.1+gitr${SRCREV}"
-PR = "r1"
-
-inherit autotools pkgconfig update-rc.d distutils-base
-
-EXTRA_OECONF = "--enable-python --with-python-includes=${STAGING_INCDIR}/.."
-
-INITSCRIPT_NAME = "fsod"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/openmoko-gsoc2008.git;protocol=git;branch=master \
-  file://autofoo.patch;patch=1 \
-#  file://fsod \
-"
-S = "${WORKDIR}/git/fsod"
-
-do_install_append() {
-#        install -d ${D}${sysconfdir}/init.d
-#        install -m 0755 ${WORKDIR}/fsod ${D}${sysconfdir}/init.d/
-}
-
-RCONFLICTS_${PN} = "frameworkd"
-RREPLACES_${PN} = "frameworkd"
-
-FILES_${PN} += "${sysconfdir} ${datadir}"
-FILES_${PN}-dbg += "\
-  ${bindir}/.debug \
-  ${libdir}/fsod/subsystems/.debug \
-  ${libdir}/fsod/subsystems/*/.debug \
-"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index cb3e1586db..06aecf7415 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -1,2 +1,8 @@
 require cornucopia.inc
 inherit fso-plugin
+
+DEPENDS += "alsa-lib libcanberra"
+RDEPENDS += "libcanberra-alsa"
+RRECOMMENDS += "fso-alsa-data"
+PV = "0.9.0+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index cb3e1586db..f7e12e9d63 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -1,2 +1,4 @@
 require cornucopia.inc
 inherit fso-plugin
+PR = "${INC_PR}.0"
+
diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb
new file mode 100644
index 0000000000..4a14b25aef
--- /dev/null
+++ b/recipes/freesmartphone/fsonetworkd_git.bb
@@ -0,0 +1,4 @@
+require cornucopia.inc
+inherit fso-plugin
+PV = "0.0.1.0+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/fsoraw_svn.bb b/recipes/freesmartphone/fsoraw_svn.bb
new file mode 100644
index 0000000000..61c6daeee0
--- /dev/null
+++ b/recipes/freesmartphone/fsoraw_svn.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "A console wrapper for the FSO Usage API"
+SECTION = "fso/base"
+PRIORITY = "optional"
+HOMEPAGE = "http://noko.sourceforge.net"
+LICENSE = "GPL"
+DEPENDS = "dbus"
+PV = "0.0.1"
+PR = "r0"
+
+SRC_URI = "svn://noko.svn.sourceforge.net/svnroot/noko/trunk;module=fsoraw;proto=https"
+S = "${WORKDIR}/fsoraw/"
+
+inherit autotools
diff --git a/recipes/freesmartphone/fsotimed_git.bb b/recipes/freesmartphone/fsotimed_git.bb
new file mode 100644
index 0000000000..3c789ad46c
--- /dev/null
+++ b/recipes/freesmartphone/fsotimed_git.bb
@@ -0,0 +1,4 @@
+require cornucopia.inc
+inherit fso-plugin
+PV = "0.1.0+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/fsousaged_git.bb b/recipes/freesmartphone/fsousaged_git.bb
new file mode 100644
index 0000000000..a7e4a1c0ee
--- /dev/null
+++ b/recipes/freesmartphone/fsousaged_git.bb
@@ -0,0 +1,4 @@
+require cornucopia.inc
+inherit fso-plugin
+PV = "0.9.0.1+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/libframeworkd-glib_git.bb b/recipes/freesmartphone/libframeworkd-glib_git.bb
index 79e040ed35..bce8312fcb 100644
--- a/recipes/freesmartphone/libframeworkd-glib_git.bb
+++ b/recipes/freesmartphone/libframeworkd-glib_git.bb
@@ -2,10 +2,15 @@ DESCRIPTION = "freesmartphone.org API glib wrapper"
 LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "dbus-glib"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libframeworkd-glib.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools autotools_stage pkgconfig
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb
new file mode 100644
index 0000000000..3bf1b39b69
--- /dev/null
+++ b/recipes/freesmartphone/libfso-glib_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GLib-based DBus bindings for freesmartphone.org - Vala implementation"
+AUTHOR = "Didier 'Ptitjes"
+LICENSE = "LGPL"
+SECTION = "devel"
+DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
+# remove the x on next version bump
+PV = "0.2.1+gitr${SRCREV}"
+PR = "r0"
+
+inherit autotools_stage pkgconfig vala
+
+SRC_URI = "git://git.freesmartphone.org/libfso-glib.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "\
+  SPECS_PATH=${STAGING_DATADIR}/fso-specs/ \
+"
+
+FILES_${PN}-dev += "${datadir}/gir-1.0/*.gir"
diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb
new file mode 100644
index 0000000000..5c4867a699
--- /dev/null
+++ b/recipes/freesmartphone/libfsobasics_git.bb
@@ -0,0 +1,6 @@
+require cornucopia.inc
+
+DESCRIPTION = "freesmartphone.org support library"
+DEPENDS += "misc-vapi"
+PV = "0.8.2.0+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb
index 2fb01bfeb2..7c70da4fb9 100644
--- a/recipes/freesmartphone/libfsoframework_git.bb
+++ b/recipes/freesmartphone/libfsoframework_git.bb
@@ -1,3 +1,6 @@
 require cornucopia.inc
 DESCRIPTION = "freesmartphone.org support library"
+DEPENDS += "misc-vapi libfsobasics"
+PV = "0.2.0.0+gitr${SRCREV}"
+PR = "${INC_PR}.1"
 
diff --git a/recipes/freesmartphone/libfsotransport_git.bb b/recipes/freesmartphone/libfsotransport_git.bb
index c46721eca6..c23896ee24 100644
--- a/recipes/freesmartphone/libfsotransport_git.bb
+++ b/recipes/freesmartphone/libfsotransport_git.bb
@@ -1,3 +1,5 @@
 require cornucopia.inc
 DESCRIPTION = "freesmartphone.org transport library"
-
+DEPENDS += "misc-vapi"
+PV = "0.9.4+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb
index b24e0b73a9..b1dddcd40d 100644
--- a/recipes/freesmartphone/libgsm0710_git.bb
+++ b/recipes/freesmartphone/libgsm0710_git.bb
@@ -1,6 +1,4 @@
 DESCRIPTION = "A GSM 07.10 Protocol Engine"
-AUTHOR = "TROLLTECH ASA, Michael Lauer"
-HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/libgsm0710"
 LICENSE = "GPL"
 SECTION = "devel"
 PV = "1.1.1+gitr${SRCREV}"
@@ -9,7 +7,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig
-
-# ship vala bindings
-FILES_${PN}-dev += "${datadir}/vala"
+inherit autotools_stage pkgconfig vala
diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb
index 108c6d5672..3a1110a605 100644
--- a/recipes/freesmartphone/libgsm0710mux_git.bb
+++ b/recipes/freesmartphone/libgsm0710mux_git.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "A GSM 07.10 Multiplexing Engine"
-HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/libgsm0710mux"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 LICENSE = "GPL"
 SECTION = "devel"
-DEPENDS = "libgsm0710 vala-native glib-2.0 libfsotransport"
-PV = "0.3.4+gitr${SRCREV}"
-PR = "r1"
+DEPENDS = "glib-2.0 libgsm0710 libfsotransport"
+PV = "0.3.6+gitr${SRCREV}"
+PR = "r0"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/libgsm0710mux;protocol=git;branch=master \
@@ -13,7 +12,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig
+inherit autotools_stage pkgconfig vala
 
 do_install_append() {
 	install -d ${D}${sysconfdir}
@@ -23,8 +22,6 @@ do_install_append() {
 PACKAGES =+ "${PN}-config"
 
 FILES_${PN} += "${sysconfdir} ${datadir}"
-# ship vapi file
-FILES_${PN}-dev += "${datadir}/vala"
 
 RRECOMMENDS_${PN} = "${PN}-config"
 
diff --git a/recipes/freesmartphone/menu-freesmartphone.bb b/recipes/freesmartphone/menu-freesmartphone.bb
new file mode 100644
index 0000000000..2d1f6145c4
--- /dev/null
+++ b/recipes/freesmartphone/menu-freesmartphone.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "XDG menu file for the freesmartphone.org project"
+LICENSE = "PD"
+PV = "0.1"
+PR = "r0"
+
+SRC_URI = "file://applications.menu"
+
+do_install() {
+    install -d ${D}/${sysconfdir}/xdg/menus
+    install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
+}
+
+RPROVIDES_${PN} = "e-wm-menu"
+CONFFILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu"
+FILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu"
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/recipes/freesmartphone/menu-freesmartphone/applications.menu b/recipes/freesmartphone/menu-freesmartphone/applications.menu
new file mode 100644
index 0000000000..58b6c1c96b
--- /dev/null
+++ b/recipes/freesmartphone/menu-freesmartphone/applications.menu
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs>/usr/share/applications</DefaultAppDirs>
+  <DefaultDirectoryDirs/>
+
+  <Menu>
+    <Name>All</Name>
+    <Include>
+      <All/>
+    </Include>
+  </Menu>
+</Menu>
+
diff --git a/recipes/freesmartphone/misc-vapi_git.bb b/recipes/freesmartphone/misc-vapi_git.bb
new file mode 100644
index 0000000000..8c4a22f5d9
--- /dev/null
+++ b/recipes/freesmartphone/misc-vapi_git.bb
@@ -0,0 +1,4 @@
+require cornucopia.inc
+DEPENDS = "alsa-lib"
+PV = "0.2.0+git${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb
new file mode 100644
index 0000000000..5031ae5c13
--- /dev/null
+++ b/recipes/freesmartphone/opimd-utils_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Test scripts for freesmartphone.org opimd interface"
+HOMEPAGE = "http://freesmartphone.org"
+LICENSE ?= "GPL"
+SECTION = "x11/application"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r0"
+
+inherit setuptools
+
+SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http"
+S = "${WORKDIR}/git"
+
+RDEPENDS = "\
+  python-elementary \
+  python-edbus \
+  python-codecs \
+  python-shell \
+  \
+  shr-settings \
+  shr-theme \
+  frameworkd \
+  pyphonelog \
+"
+
+FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier"
+FILES_${PN} += "${prefix}/share/applications/"
+FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/"
diff --git a/recipes/freesmartphone/pycd_git.bb b/recipes/freesmartphone/pycd_git.bb
new file mode 100644
index 0000000000..3ed2b75292
--- /dev/null
+++ b/recipes/freesmartphone/pycd_git.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Python Clone Factory"
+AUTHOR = "Jan Luebbe <jluebbe@debian.org>"
+HOMEPAGE = "http://www.freesmartphone.org"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+PV = "0.1+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
+RDEPENDS_${PN} = "\
+  python-dbus \
+  python-misc \
+  python-pkgutil \
+  python-resource \
+"
+
+do_compile() {
+	${CC} pyc.c -o pyc
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 755 pyc ${D}${bindir}/pyc
+	install -d ${D}${sbindir}
+	install -m 755 pycd.py ${D}${sbindir}/pycd
+	install -d ${D}${sysconfdir}/dbus-1
+	install -m 644 pycd.conf ${D}${sysconfdir}/dbus-1
+}
+
diff --git a/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb b/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
index 3076f9501c..72f835e6a5 100644
--- a/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
+++ b/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
@@ -1,17 +1,11 @@
 DESCRIPTION = "Vala DBus Binding Tool"
 SECTION = "console"
 LICENSE = "GPLv2"
-DEPENDS = "vala-native"
+DEPENDS = "vala-native intltool-native libxml2-native"
 PV = "0.1.0+gitr${SRCREV}"
-PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools native
-
-do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}
-	install -m 0755 src/vala-dbus-binding-tool ${STAGING_BINDIR_NATIVE}/
-}
+inherit autotools native autotools_stage
 
diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb
new file mode 100644
index 0000000000..3746cd34ab
--- /dev/null
+++ b/recipes/tasks/task-fso2-compliance.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "The freesmartphone.org Framework 2.0. \
+Install this task to make your distribution FSO 2.0-compliant."
+SECTION = "fso/base"
+LICENSE = "MIT"
+PV = "1.9.0"
+PR = "r1"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+  dbus-hlid \
+  \
+  libfsobasics \
+  libfsotransport \
+  libfsoframework \
+  \
+  fsodeviced \
+  fsonetworkd \
+  fsotimed \
+  fsousaged \
+  \
+  fso-alsa-data \
+  fso-apm \
+  fso-gpsd \
+  fso-monitord \
+  connman \
+  connman-scripts \
+  connman-plugin-bluetooth \
+#  connman-plugin-dhclient \
+#  connman-plugin-dnsproxy \
+#  connman-plugin-ethernet \
+#  connman-plugin-fake \
+  connman-plugin-loopback \
+  connman-plugin-pppd \
+#  connman-plugin-resolvconf \
+  connman-plugin-udhcp \
+  connman-plugin-wifi \
+#  connman-test-utils \
+"
+
+RRECOMMENDS_${PN} = "\
+  fso-abyss \
+  wmiconfig \
+  \
+  tzdata \
+  tzdata-americas \
+  tzdata-asia \
+  tzdata-europe \
+"