[pkg-fso-commits] [SCM] openmoko-files-config, various files for the Openmoko devices branch, master, updated. debian/20090224-1-10-g13f1507

Sebastian Reichel elektranox at gmail.com
Sat Nov 14 21:35:05 UTC 2009


The following commit has been merged in the master branch:
commit 13f150709bafb698781631c785965b25250107e3
Author: Sebastian Reichel <elektranox at gmail.com>
Date:   Sat Nov 14 22:35:02 2009 +0100

    update for new frameworkd version

diff --git a/GTA01_Neo-1973/etc/frameworkd.conf b/GTA01_Neo-1973/etc/frameworkd.conf
index 4827040..00ee078 100644
--- a/GTA01_Neo-1973/etc/frameworkd.conf
+++ b/GTA01_Neo-1973/etc/frameworkd.conf
@@ -3,7 +3,7 @@
 version = 1
 # the default log_level, if not specified per module
 # available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
-log_level = INFO
+log_level = WARNING
 # the global log_destination. Uncomment to enable
 log_to = stderr
 #log_to = file
@@ -97,26 +97,33 @@ path = /etc/init.d/gllin
 
 [ousaged]
 # set 1 to disable a module
-disable = 0
+# you need to disable ousaged if you want to use the new implementation: fso-usaged
+disable = 1
 # choose whether resources should be disabled at startup, at shutdown, always (default), or never.
 sync_resources_with_lifecycle = always
 
 [opreferencesd]
 # set 1 to disable a module
 disable = 0
-log_level = DEBUG
+log_level = WARNING
 rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
 
 [oeventsd]
 # set 1 to disable a module
 disable = 0
-log_level = DEBUG
+log_level = WARNING
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
 
 [opimd]
 # set 1 to disable a module
-disable = 1
+disable = 0
 contacts_default_backend = CSV-Contacts
+messages_default_backend = SIM-Messages-FSO
+calls_default_backend = SQLite-Calls
+dates_default_backend = SQLite-Dates
+notes_default_backend = SQLite-Notes
+tasks_default_backend = SQLite-Tasks
+contacts_merging_enabled = 1
 messages_default_folder = Unfiled
 messages_trash_folder = Trash
 sim_messages_default_folder = SMS
@@ -127,9 +134,8 @@ rootdir = ../etc/freesmartphone/opim:/etc/freesmartphone/opim:/usr/etc/freesmart
 timesources = GPS,NTP
 zonesources = GSM
 
-# to use fsousaged instead of ousaged activate these options
-# and set disable=1 in the ousaged-section
-#[fsousage]
-#lowlevel_type = openmoko
-#[fsousage.dbus_service]
-#[fsousage.lowlevel_openmoko]
+[fsousage]
+lowlevel_type = openmoko
+
+[fsousage.dbus_service]
+[fsousage.lowlevel_openmoko]
diff --git a/GTA02_Neo-FreeRunner/etc/frameworkd.conf b/GTA02_Neo-FreeRunner/etc/frameworkd.conf
index 0d3cb47..20251a7 100644
--- a/GTA02_Neo-FreeRunner/etc/frameworkd.conf
+++ b/GTA02_Neo-FreeRunner/etc/frameworkd.conf
@@ -1,9 +1,9 @@
 [frameworkd]
 # indicates this configuration version, do not change
 version = 1
-# the default log_level, if not specified per module
+# the default log_level, if not specified per subsystem or module
 # available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
-log_level = INFO
+log_level = WARNING
 # the global log_destination. Uncomment to enable
 log_to = stderr
 #log_to = file
@@ -104,39 +104,61 @@ path = /dev/ttySAC1
 
 [ousaged]
 # set 1 to disable a module
-disable = 0
+# you need to disable ousaged if you want to use the new implementation: fso-usaged
+disable = 1
 # choose whether resources should be disabled at startup, at shutdown, always (default), or never.
 sync_resources_with_lifecycle = always
 
+[ousaged.generic]
+
 [opreferencesd]
 # set 1 to disable a module
 disable = 0
-log_level = DEBUG
-rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+log_level = WARNING
+
+[opreferencesd.opreferences]
 
 [oeventsd]
 # set 1 to disable a module
 disable = 0
-log_level = DEBUG
-rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+log_level = WARNING
+
+[oeventsd.oevents]
+
+[onetworkd]
+[onetworkd.network]
+
+[ophoned]
+[ophoned.ophoned]
 
 [opimd]
 # set 1 to disable a module
-disable = 1
+disable = 0
 contacts_default_backend = CSV-Contacts
+messages_default_backend = SIM-Messages-FSO
+calls_default_backend = SQLite-Calls
+dates_default_backend = SQLite-Dates
+notes_default_backend = SQLite-Notes
+tasks_default_backend = SQLite-Tasks
+contacts_merging_enabled = 1
 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]
+
 [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
+
+[otimed.otimed]
+
+[fsousage]
+lowlevel_type = openmoko
 
-# to use fsousaged instead of ousaged activate these options
-# and set disable=1 in the ousaged-section
-#[fsousage]
-#lowlevel_type = openmoko
-#[fsousage.dbus_service]
-#[fsousage.lowlevel_openmoko]
+[fsousage.dbus_service]
+[fsousage.lowlevel_openmoko]
diff --git a/GTA02_Neo-FreeRunner/etc/frameworkd.conf b/General/etc/frameworkd.conf
similarity index 67%
copy from GTA02_Neo-FreeRunner/etc/frameworkd.conf
copy to General/etc/frameworkd.conf
index 0d3cb47..3bbcdb9 100644
--- a/GTA02_Neo-FreeRunner/etc/frameworkd.conf
+++ b/General/etc/frameworkd.conf
@@ -1,48 +1,45 @@
 [frameworkd]
 # indicates this configuration version, do not change
 version = 1
-# the default log_level, if not specified per module
+# the default log_level, if not specified per subsystem or module
 # available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
 log_level = INFO
 # the global log_destination. Uncomment to enable
+# available destinations are: stderr, file, syslog
 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"
+# persistence 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 1 to disable a module
+# set 1 to disable a subsystem or a module
 disable = 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.accelerometer]
+disable = 1
 
 [odeviced.audio]
 # set 1 to disable a module
-disable = 0
+disable = 1
 # 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]
-# set 1 to disable a module
-disable = 0
-# don't read from accellerometers for GTA02
-ignoreinput = 2,3
+# add input nodes to ignore for idle activity
+ignoreinput = 2,3,4
 # configure timeouts (in seconds) here. A value of 0
-# means 'never fall into this state' (except programatically)
+# means 'never fall into this state' (except programmatically)
 idle = 10
 idle_dim = 20
 idle_prelock = 12
@@ -51,27 +48,60 @@ suspend = 0
 
 [odeviced.input]
 # set 1 to disable a module
-disable = 0
-# don't read from accellerometers for GTA02
-ignoreinput = 2,3
+disable = 1
 # 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 = USB,key,356,0
+report3 = CHARGER,key,356,0
 report4 = HEADSET,switch,2,0
 
-[odeviced.powercontrol-neo]
+[odeviced.kernel26]
+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]
+# set 1 to disable a module
+disable = 1
+
+#
+# Subsystem configuration for oeventsd
+#
+[oeventsd]
 # set 1 to disable a module
 disable = 0
+log_level = DEBUG
 
-# disable accelerometer since it uses LOADS of CPU resources
-[odeviced.accelerometer]
+[oeventsd.oevents]
+
+#
+# Subsystem configuration for ogspd
+#
+[ogpsd]
+# set 1 to disable a module
 disable = 1
-accelerometer_type = gta02
+# 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
+
+[ogpsd.factory]
 
+#
+# Subsystem configuration for ogsmd
+#
 [ogsmd]
 # set 1 to disable a module
-disable = 0
+disable = 1
 # choose your modem type, available types are: ti_calypso, freescale_neptune, singleline, muxed4line, option, ...
 modemtype = ti_calypso
 # if you have a ti_calypso, you can choose the deep sleep mode. Valid values are: never, adaptive (default), always
@@ -90,53 +120,69 @@ ti_calypso_deep_sleep = adaptive
 #    "none": No audio processing.
 ti_calypso_dsp_mode = aec+nr
 # choose your muxer, available types are: gsm0710muxd [default], fso-abyss
-#ti_calypso_muxer = fso-abyss
+ti_calypso_muxer = gsm0710muxd
 
-[ogpsd]
-# set 1 to disable a module
-disable = 0
-# 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
+#
+# Subsystem configuration for onetworkd
+#
+[onetworkd]
 
-[ousaged]
-# set 1 to disable a module
-disable = 0
-# choose whether resources should be disabled at startup, at shutdown, always (default), or never.
-sync_resources_with_lifecycle = always
+[onetworkd.network]
 
-[opreferencesd]
-# set 1 to disable a module
-disable = 0
-log_level = DEBUG
-rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+#
+# Subsystem configuration for ophoned
+#
+[ophoned]
 
-[oeventsd]
-# set 1 to disable a module
-disable = 0
-log_level = DEBUG
-rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+[ophoned.ophoned]
 
+#
+# Subsystem configuration for opimd
+#
 [opimd]
-# set 1 to disable a module
-disable = 1
 contacts_default_backend = CSV-Contacts
+messages_default_backend = SIM-Messages-FSO
+calls_default_backend = SQLite-Calls
+dates_default_backend = SQLite-Dates
+notes_default_backend = SQLite-Notes
+tasks_default_backend = SQLite-Tasks
+contacts_merging_enabled = 1
 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]
+# set 1 to disable a module
+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
+# use an ip address here, otherwise DNS resolution will block
+ntpserver = 134.169.172.1
+
+[otimed.otimed]
+
+#
+# Subsystem configuration for ousaged
+#
+[ousaged]
+# set 1 to disable a module
+disable = 0
+# choose whether resources should be disabled at startup, at shutdown, always (default), or never.
+sync_resources_with_lifecycle = always
 
-# to use fsousaged instead of ousaged activate these options
-# and set disable=1 in the ousaged-section
-#[fsousage]
-#lowlevel_type = openmoko
-#[fsousage.dbus_service]
-#[fsousage.lowlevel_openmoko]
+[ousaged.generic]
diff --git a/common/etc/freesmartphone/oevents/rules.yaml b/common/etc/freesmartphone/oevents/rules.yaml
index 75b87fd..0686b6f 100644
--- a/common/etc/freesmartphone/oevents/rules.yaml
+++ b/common/etc/freesmartphone/oevents/rules.yaml
@@ -57,15 +57,29 @@
     actions:
              - RingTone()
              - SetDisplayBrightness("0", 90)
-             - OccupyResource(CPU)
 
 -
     while: CallStatus()
-    filters: Or(HasAttr(status, "outgoing"), HasAttr(status, "active"))
+    filters: Not(HasAttr(status, "release"))
     actions:
-            - SetScenario(gsmhandset)
             - OccupyResource(CPU)
 -
+    while: CallStatus()
+    filters:
+            - Or(HasAttr(status, "outgoing"), HasAttr(status, "active"))
+            - Not(BTHeadsetIsConnected())
+    actions:
+            - SetScenario(gsmhandset)
+-
+    while: CallStatus()
+    filters:
+            - Or(HasAttr(status, "outgoing"), HasAttr(status, "active"))
+            - BTHeadsetIsConnected()
+    actions:
+            - SetScenario(gsmbluetooth)
+            - BTHeadsetPlaying()
+
+-
     while: PowerStatus()
     filters: HasAttr(status, "charging")
     actions: SetLed("gta02_power_orange", "light")
diff --git a/debian/changelog b/debian/changelog
index 0c9d705..ad15522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,23 @@
-openmoko-files-config (20090224-2) UNRELEASED; urgency=low
-
- [ Lionel Elie Mamane ]
-  * Adapt VCS-* fields to source package rename
-  * Disable frameworkd suspend-on-power-button in order not to conflict
-    with openmoko-panel-plugin power-button feature
-
- -- Joachim Breitner <nomeata at debian.org>  Mon, 27 Jul 2009 00:15:29 +0200
+openmoko-files-config (20091114) unstable; urgency=low
+
+  [ Sebastian Reichel ]
+   * update for usage with more recent fso-frameworkd
+    - use fso-usaged instead of ousaged
+    - enable opimd
+   * Move general configuration binary package from
+     fso-frameworkd to this package
+   * Add myself to Uploaders
+   * Allow DM upload
+   * Bump Debian Standards Version to 3.8.3
+   * removed watch file, it's not needed in debian native packages
+   * no -1 for debian native packages
+
+  [ Lionel Elie Mamane ]
+   * Adapt VCS-* fields to source package rename
+   * Disable frameworkd suspend-on-power-button in order not to conflict
+     with openmoko-panel-plugin power-button feature
+
+ -- Sebastian Reichel <elektranox at gmail.com>  Sat, 14 Nov 2009 22:00:00 +0200
 
 openmoko-files-config (20090224-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2db62dd..8f45d5b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,22 @@ Source: openmoko-files-config
 Section: misc
 Priority: extra
 Maintainer: Debian freesmartphone.org Team <pkg-fso-maint at lists.alioth.debian.org>
-Uploaders: Luca Capello <luca at pca.it>, Joachim Breitner <nomeata at debian.org>
+Uploaders: Luca Capello <luca at pca.it>, Joachim Breitner <nomeata at debian.org>, Sebastian Reichel <elektranox at gmail.com>
+DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://freesmartphone.org/
 Vcs-Git: git://git.debian.org/git/pkg-fso/openmoko-files-config.git
 Vcs-Browser: http://git.debian.org/?p=pkg-fso/openmoko-files-config.git;a=summary
 
 Package: fso-config-gta01
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.8.4.3-1), fso-sounds-yue-base | fso-sounds
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         fso-frameworkd (>= 0.9.5.9+git20090920-1),
+         fso-sounds-yue-base | fso-sounds,
+         fso-usaged (>= 0.9.1+git20091016-1),
+         fso-gsm0710muxd | fso-abyss
 Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
 Replaces: fso-config
 Provides: fso-config
@@ -25,7 +31,12 @@ Description: configuration files for Openmoko GTA01 Neo 1973
 
 Package: fso-config-gta02
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.8.4.3-1), fso-sounds-yue-base | fso-sounds
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         fso-frameworkd (>= 0.9.5.9+git20090920-1),
+         fso-sounds-yue-base | fso-sounds,
+         fso-usaged (>= 0.9.1+git20091016-1),
+         fso-gsm0710muxd | fso-abyss
 Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
 Replaces: fso-config
 Provides: fso-config
@@ -36,3 +47,18 @@ Description: configuration files for Openmoko GTA02 Neo FreeRunner
  .
  This package is part of the freesmartphone.org software stack
  and it is targeted for smartphones.
+
+Package: fso-config-general
+Architecture: all
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         fso-frameworkd (>= 0.9.5.9+git20090920-1)
+Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
+Replaces: fso-config
+Provides: fso-config
+Description: general configuration files for the freesmartphone.org frameworkd
+ This packages provides the freesmartphone.org frameworkd configuration
+ files. It also depends on the default fso-sounds package.
+ .
+ This package is part of the freesmartphone.org software stack
+ and it is targeted for smartphones.
diff --git a/debian/fso-config-general.install b/debian/fso-config-general.install
new file mode 100644
index 0000000..985a898
--- /dev/null
+++ b/debian/fso-config-general.install
@@ -0,0 +1,2 @@
+common/* /
+General/* /
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 4f269c1..0000000
--- a/debian/watch
+++ /dev/null
@@ -1 +0,0 @@
-# Upstream does not have any tarball, thus no need for a watch file.

-- 
openmoko-files-config, various files for the Openmoko devices



More information about the pkg-fso-commits mailing list