--- /dev/null
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fso-frameworkd
+PKG_VERSION:=20090609
+PKG_REV:=74fc21962e9bbc7f2a89c74f12c15ce1b5861bfb
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=git://git.freesmartphone.org/framework.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+PKG_BUILD_DEPENDS:=cython python
+
+include $(INCLUDE_DIR)/package.mk
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+
+ifeq ($(CONFIG_TARGET_s3c24xx),y)
+ CONFIG=om_gta02
+endif
+
+define Package/fso-frameworkd
+ SECTION:=phone
+ CATEGORY:=Phone
+ TITLE:=framework for the freesmartphone.org DBus API reference implementation
+ DEPENDS:=+python +dbus-python +python-gobject +pyserial +pyyaml \
+ +gst-python +alsa-utils +freerunner-alsa-scenarios
+ URL:=http://www.freesmartphone.org
+endef
+
+define Package/fso-frameworkd/description
+ freesmartphone.org is a collaboration platform for open source and open discussion software projects working on interoperability and shared technology for Linux-based SmartPhones
+endef
+
+define Build/Compile
+ $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr")
+endef
+
+define Package/fso-frameworkd/install
+ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(1)/usr/bin $(1)/etc/init.d
+ $(CP) \
+ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
+ $(1)$(PYTHON_PKG_DIR)
+ $(INSTALL_BIN) \
+ $(PKG_INSTALL_DIR)/usr/bin/* \
+ $(1)/usr/bin/
+ $(INSTALL_BIN) ./files/frameworkd.init $(1)/etc/init.d/frameworkd
+ $(CP) \
+ $(PKG_INSTALL_DIR)/../etc/* \
+ $(1)/etc/
+ $(if $(CONFIG),$(INSTALL_CONF) ./files/frameworkd.conf.$(CONFIG) $(1)/etc/frameworkd.conf,$(CP) ./files/frameworkd.conf $(1)/etc/frameworkd.conf)
+endef
+
+$(eval $(call BuildPackage,fso-frameworkd))
--- /dev/null
+[frameworkd]
+version = 1
+log_level = INFO
+log_to = file
+log_destination = /var/log/frameworkd.log
+
+[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
+
+[odeviced.input]
+# don't read from accellerometers for GTA02
+ignoreinput=2,3
+# keys
+report1 = AUX,key,169,1
+report2 = POWER,key,116,1
+report3 = USB,key,356,0
+report4 = HEADSET,switch,2,0
+
+# disable accelerometer since it uses LOADS of CPU resources
+[odeviced.accelerometer]
+disable = 1
+accelerometer_type = gta02
+
+[ogsmd]
+# GTA02 has TI Calypso
+modemtype = ti_calypso
+ti_calypso_deep_sleep = never
+
+[ogpsd]
+device = GTA02Device
+channel = SerialChannel
+path = /dev/ttySAC1
+
+[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
+
+[opimd]
+disable = 1
+
+#[otimed]
+## a list of time/zone sources to use or NONE
+#timesources = GPS,NTP
+#zonesources = GSM
+## use an ip address here, otherwise DNS resolution will block
+#ntpserver = 134.169.172.1
--- /dev/null
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008 OpenWrt.org
+START=80
+
+start() {
+ /usr/bin/frameworkd &
+}
+
+stop() {
+ killall frameworkd
+}
--- /dev/null
+diff -ruN fso-20090103.orig/framework/cxnet/common.py fso-20090103/framework/cxnet/common.py
+--- fso-20090103.orig/framework/cxnet/common.py 2009-01-05 10:09:43.000000000 +0100
++++ fso-20090103/framework/cxnet/common.py 2009-01-07 11:10:52.000000000 +0100
+@@ -38,7 +38,14 @@
+ else:
+ cx_int = c_uint64
+
+-libc = CDLL("libc.so.6")
++from os import listdir
++from re import compile
++re = compile('^libc.so.[0-9]$')
++libs = listdir('/lib')
++for lib in libs:
++ if re.match(lib):
++ libc = CDLL(lib)
++ break
+
+ def hdump(name,msg,size=0):
+ """
+diff -ruN fso-20090103.orig/framework/patterns/kobject.py fso-20090103/framework/patterns/kobject.py
+--- fso-20090103.orig/framework/patterns/kobject.py 2009-01-05 10:09:43.000000000 +0100
++++ fso-20090103/framework/patterns/kobject.py 2009-01-07 13:37:58.000000000 +0100
+@@ -88,7 +88,13 @@
+ self._watchR = gobject.io_add_watch( self._socketR.fileno(), gobject.IO_IN, self._onActivityR )
+
+ # for rtnetlink assistance
+- self._libc = ctypes.CDLL( "libc.so.6" )
++ from re import compile
++ re = compile('^libc.so.[0-9]$')
++ libs = os.listdir('/lib')
++ for lib in libs:
++ if re.match(lib):
++ self._libc = ctypes.CDLL(lib)
++ break
+ self._parser = RtNetlinkParser()
+
+ def __del__( self ):
+Binary files fso-20090103.orig/framework/patterns/.kobject.py.swp and fso-20090103/framework/patterns/.kobject.py.swp differ
+diff -ruN fso-20090103.orig/framework/subsystems/odeviced/pyglet/linux.py fso-20090103/framework/subsystems/odeviced/pyglet/linux.py
+--- fso-20090103.orig/framework/subsystems/odeviced/pyglet/linux.py 2009-01-05 10:09:43.000000000 +0100
++++ fso-20090103/framework/subsystems/odeviced/pyglet/linux.py 2009-01-07 12:15:13.000000000 +0100
+@@ -15,7 +15,13 @@
+ import struct
+ import sys
+
+-c = ctypes.cdll.LoadLibrary('libc.so.6')
++from re import compile
++re = compile('^libc.so.[0-9]$')
++libs = os.listdir('/lib')
++for lib in libs:
++ if re.match(lib):
++ c = ctypes.cdll.LoadLibrary(lib)
++ break
+
+ _IOC_NRBITS = 8
+ _IOC_TYPEBITS = 8
--- /dev/null
+diff -ruN fso-20090609.orig/etc/freesmartphone/oevents/rules.yaml fso-20090609/etc/freesmartphone/oevents/rules.yaml
+--- fso-20090609.orig/etc/freesmartphone/oevents/rules.yaml 2009-06-10 15:55:56.000000000 +0200
++++ fso-20090609/etc/freesmartphone/oevents/rules.yaml 2009-06-10 15:57:00.000000000 +0200
+@@ -133,14 +133,3 @@
+ #
+ # Idleness Brightness Handling
+ #
+- trigger: IdleState()
+- filters: HasAttr(status, "busy")
+- actions: SetDisplayBrightness("0", 90)
+--
+- trigger: IdleState()
+- filters: HasAttr(status, "idle_dim")
+- actions: SetDisplayBrightness("0", 20)
+--
+- trigger: IdleState()
+- filters: HasAttr(status, "idle_prelock")
+- actions: SetDisplayBrightness("0", 0)
+++ /dev/null
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fso
-PKG_VERSION:=20090609
-PKG_REV:=74fc21962e9bbc7f2a89c74f12c15ce1b5861bfb
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://git.freesmartphone.org/framework.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-
-PKG_BUILD_DEPENDS:=cython python
-
-include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-
-ifeq ($(CONFIG_TARGET_s3c24xx),y)
- CONFIG=om_gta02
-endif
-
-define Package/fso
- SECTION:=phone
- CATEGORY:=Phone
- TITLE:=freesmartphone.org DBus API reference implementation
- DEPENDS:=+python +dbus-python +python-gobject +pyserial +pyyaml \
- +gst-python +alsa-utils +freerunner-alsa-scenarios
- URL:=http://www.freesmartphone.org
-endef
-
-define Package/fso/description
- freesmartphone.org is a collaboration platform for open source and open discussion software projects working on interoperability and shared technology for Linux-based SmartPhones
-endef
-
-define Build/Compile
- $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr")
-endef
-
-define Package/fso/install
- $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(1)/usr/bin $(1)/etc/init.d
- $(CP) \
- $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
- $(1)$(PYTHON_PKG_DIR)
- $(INSTALL_BIN) \
- $(PKG_INSTALL_DIR)/usr/bin/* \
- $(1)/usr/bin/
- $(INSTALL_BIN) ./files/frameworkd.init $(1)/etc/init.d/frameworkd
- $(CP) \
- $(PKG_INSTALL_DIR)/../etc/* \
- $(1)/etc/
- $(if $(CONFIG),$(INSTALL_CONF) ./files/frameworkd.conf.$(CONFIG) $(1)/etc/frameworkd.conf,$(CP) ./files/frameworkd.conf $(1)/etc/frameworkd.conf)
-endef
-
-$(eval $(call BuildPackage,fso))
+++ /dev/null
-[frameworkd]
-version = 1
-log_level = INFO
-log_to = file
-log_destination = /var/log/frameworkd.log
-
-[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
-
-[odeviced.input]
-# don't read from accellerometers for GTA02
-ignoreinput=2,3
-# keys
-report1 = AUX,key,169,1
-report2 = POWER,key,116,1
-report3 = USB,key,356,0
-report4 = HEADSET,switch,2,0
-
-# disable accelerometer since it uses LOADS of CPU resources
-[odeviced.accelerometer]
-disable = 1
-accelerometer_type = gta02
-
-[ogsmd]
-# GTA02 has TI Calypso
-modemtype = ti_calypso
-ti_calypso_deep_sleep = never
-
-[ogpsd]
-device = GTA02Device
-channel = SerialChannel
-path = /dev/ttySAC1
-
-[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
-
-[opimd]
-disable = 1
-
-#[otimed]
-## a list of time/zone sources to use or NONE
-#timesources = GPS,NTP
-#zonesources = GSM
-## use an ip address here, otherwise DNS resolution will block
-#ntpserver = 134.169.172.1
+++ /dev/null
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008 OpenWrt.org
-START=80
-
-start() {
- /usr/bin/frameworkd &
-}
-
-stop() {
- killall frameworkd
-}
+++ /dev/null
-diff -ruN fso-20090103.orig/framework/cxnet/common.py fso-20090103/framework/cxnet/common.py
---- fso-20090103.orig/framework/cxnet/common.py 2009-01-05 10:09:43.000000000 +0100
-+++ fso-20090103/framework/cxnet/common.py 2009-01-07 11:10:52.000000000 +0100
-@@ -38,7 +38,14 @@
- else:
- cx_int = c_uint64
-
--libc = CDLL("libc.so.6")
-+from os import listdir
-+from re import compile
-+re = compile('^libc.so.[0-9]$')
-+libs = listdir('/lib')
-+for lib in libs:
-+ if re.match(lib):
-+ libc = CDLL(lib)
-+ break
-
- def hdump(name,msg,size=0):
- """
-diff -ruN fso-20090103.orig/framework/patterns/kobject.py fso-20090103/framework/patterns/kobject.py
---- fso-20090103.orig/framework/patterns/kobject.py 2009-01-05 10:09:43.000000000 +0100
-+++ fso-20090103/framework/patterns/kobject.py 2009-01-07 13:37:58.000000000 +0100
-@@ -88,7 +88,13 @@
- self._watchR = gobject.io_add_watch( self._socketR.fileno(), gobject.IO_IN, self._onActivityR )
-
- # for rtnetlink assistance
-- self._libc = ctypes.CDLL( "libc.so.6" )
-+ from re import compile
-+ re = compile('^libc.so.[0-9]$')
-+ libs = os.listdir('/lib')
-+ for lib in libs:
-+ if re.match(lib):
-+ self._libc = ctypes.CDLL(lib)
-+ break
- self._parser = RtNetlinkParser()
-
- def __del__( self ):
-Binary files fso-20090103.orig/framework/patterns/.kobject.py.swp and fso-20090103/framework/patterns/.kobject.py.swp differ
-diff -ruN fso-20090103.orig/framework/subsystems/odeviced/pyglet/linux.py fso-20090103/framework/subsystems/odeviced/pyglet/linux.py
---- fso-20090103.orig/framework/subsystems/odeviced/pyglet/linux.py 2009-01-05 10:09:43.000000000 +0100
-+++ fso-20090103/framework/subsystems/odeviced/pyglet/linux.py 2009-01-07 12:15:13.000000000 +0100
-@@ -15,7 +15,13 @@
- import struct
- import sys
-
--c = ctypes.cdll.LoadLibrary('libc.so.6')
-+from re import compile
-+re = compile('^libc.so.[0-9]$')
-+libs = os.listdir('/lib')
-+for lib in libs:
-+ if re.match(lib):
-+ c = ctypes.cdll.LoadLibrary(lib)
-+ break
-
- _IOC_NRBITS = 8
- _IOC_TYPEBITS = 8
+++ /dev/null
-diff -ruN fso-20090609.orig/etc/freesmartphone/oevents/rules.yaml fso-20090609/etc/freesmartphone/oevents/rules.yaml
---- fso-20090609.orig/etc/freesmartphone/oevents/rules.yaml 2009-06-10 15:55:56.000000000 +0200
-+++ fso-20090609/etc/freesmartphone/oevents/rules.yaml 2009-06-10 15:57:00.000000000 +0200
-@@ -133,14 +133,3 @@
- #
- # Idleness Brightness Handling
- #
-- trigger: IdleState()
-- filters: HasAttr(status, "busy")
-- actions: SetDisplayBrightness("0", 90)
---
-- trigger: IdleState()
-- filters: HasAttr(status, "idle_dim")
-- actions: SetDisplayBrightness("0", 20)
---
-- trigger: IdleState()
-- filters: HasAttr(status, "idle_prelock")
-- actions: SetDisplayBrightness("0", 0)