[pkg-fso-maint] fso-config-gta* differences (was Re: Slowly uploading to main: freesmartphone.org core packages)
Luca Capello
luca at pca.it
Wed Jun 3 00:08:18 UTC 2009
Hi there!
I am sorry for the long mail, these are the showstoppers before
uploading this last core package to Debian main.
On Sun, 17 May 2009 21:02:50 +0200, Luca Capello wrote:
> On Fri, 15 May 2009 12:36:49 +0200, Luca Capello wrote:
>> 2) freesmartphone.org core packages
[...]
> * openmoko-files (fso-config-gta01, fso-config-gta02)
>
> First question: should we find a better name? Something like
> openmoko-files-config? I think it could be a safer name and also in
> line with openmoko-files-nonfree, i.e. openmoko-files-* sources.
In two days I will rename the source package to openmoko-files-config if
no one complains before.
> Then, because I am a maniac, the correct folder for GTA01 should be
> GTA01_Neo-1973, thus I will `git mv` it if no one will complain in the
> next day.
Done:
http://git.debian.org/?p=pkg-fso/openmoko-files.git;a=commitdiff;h=a93df33475841e618a086a966b32b2141ea98733
> Apart from that, I will merge every common file, in order to minimize
> the differences. This will probably take a bit...
This is what I discovered (useless differences removed):
=====
$ debdiff fso-config-gta01_20090202-2_all.deb fso-config-gta02_20090202-2_all.deb
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /etc/udev/rules.d/55-gta02-neo-freerunner.rules
-rw-r--r-- root/root /usr/share/openmoko/scenarios/headset.state
Files in first .deb but not in second
-------------------------------------
-rw-r--r-- root/root /etc/freesmartphone/opreferences/conf/phone/default.yaml
-rw-r--r-- root/root /etc/freesmartphone/opreferences/conf/rules/default.yaml
-rw-r--r-- root/root /etc/freesmartphone/opreferences/conf/rules/silent.yaml
-rw-r--r-- root/root /etc/udev/rules.d/55-gta01-neo1973.rules
-rw-r--r-- root/root /usr/share/openmoko/scenarios/captureheadset.state
-rw-r--r-- root/root /usr/share/openmoko/scenarios/gsmbluetooth.state
-rw-r--r-- root/root /usr/share/openmoko/scenarios/voip-headset.state
Conffiles files: lines which differ (wdiff format)
--------------------------------------------------
[-/etc/freesmartphone/opreferences/conf/phone/default.yaml-]
[-/etc/freesmartphone/opreferences/conf/rules/default.yaml-]
[-/etc/freesmartphone/opreferences/conf/rules/silent.yaml-]
[-/etc/udev/rules.d/55-gta01-neo1973.rules-]
{+/etc/udev/rules.d/55-gta02-neo-freerunner.rules+}
=====
Some considerations on which we should discuss...
1) GTA01 /etc/freesmartphone/oevents/rules.yaml is not the one from the
official FSO-milestone5.1 images for GTA01, which is exactly the same
as the GTA02 version, thus it should be common.
2) /etc/freesmartphone/opreferences/conf/phone/default.yaml is managed
by the fso-sounds virtual package, which means that it should not be
there. Unfortunately, since this is a conffile, removing it will be
for sure a pain :-(
3) the /etc/freesmartphone/opreferences/conf/profiles/* files are
exactly the same for both packages, thus they should be common.
4) What are the /etc/freesmartphone/opreferences/conf/rules/* files?
Better, why are they present only in the fso-config-gta01 package? I
guess these are general files, thus they should be common.
5) We have different scenarios: I would say strangely enough, because I
was expecting the content to differ, not the number of files.
6) the udev rules are mostly the same
--8<---------------cut here---------------start------------->8---
--- GTA01_Neo-1973/etc/udev/rules.d/55-gta01-neo1973.rules 2009-06-02 19:20:44.000000000 +0200
+++ GTA02_Neo-FreeRunner/etc/udev/rules.d/55-gta02-neo-freerunner.rules 2009-06-02 19:12:33.000000000 +0200
@@ -1,16 +1,10 @@
KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
-# Firmware Helper (Freerunner)
-# ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
-
# Firmware Helper
-ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh"
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
# Samsung UARTS
KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n"
-# Touchscreen for Xglamo (Freerunner)
-# SUBSYSTEM=="input", ATTRS{modalias}=="input:b0013vDEADpBEEFe0101-e0,1,3,k14A,ra0,1,18,mlsfw", SYMLINK+="ts"
-
-# Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+# Touchscreen for Xglamo
+SUBSYSTEM=="input", ATTRS{modalias}=="input:b0013vDEADpBEEFe0101-e0,1,3,k14A,ra0,1,18,mlsfw", SYMLINK+="ts"
--8<---------------cut here---------------end--------------->8---
a) on Debian there is /lib/udev/firmware.agent, which is never called
by any rule, thus I would suspect it is done automatically. This
means that the first lines can be removed.
b) the touchscreen is the same for both models and indeed the GTA01
udev rule is a more general version of the GTA02 one. Now that
xf86-video-glamo is in Debian main, at least I do not support
Xglamo anymore, thus the /dev/ts symlink is useless. Moreover, I
prefer by far any symlink in the /dev/input/ folder, where they
belongs. Either we remove these lines altogether or we leave the
specific one for the /dev/input/touchscreen0 symlink.
c) I have not checked if the ttySAC symlinks to the s3c2410_serial are
not already automatically created, shouldn't they?
7) while it is normal that /etc/frameworkd.conf are different, however
they both do not come from the official FSO-milestone5.1 images:
--8<---------------cut here---------------start------------->8---
--- gta01_fso-image-om_etc_frameworkd.conf 2009-06-02 20:38:14.000000000 +0200
+++ GTA01_Neo-1973/etc/frameworkd.conf 2009-06-02 19:20:44.000000000 +0200
@@ -1,7 +1,8 @@
[frameworkd]
version = 1
log_level = INFO
-log_to = syslog
+log_to = file
+log_destination = /var/log/frameworkd.log
[odeviced.audio]
# set default alsa scenario
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
--- gta02_fso-image-om_etc_frameworkd.conf 2009-02-23 21:41:39.000000000 +0100
+++ GTA02_Neo-FreeRunner/etc/frameworkd.conf 2009-06-02 19:12:33.000000000 +0200
@@ -1,7 +1,7 @@
[frameworkd]
version = 1
log_level = INFO
-log_to = syslog
+#log_to = syslog
[odeviced.audio]
# set default alsa scenario
@@ -30,7 +30,6 @@
[ogsmd]
# GTA02 has TI Calypso
modemtype = ti_calypso
-ti_calypso_deep_sleep = never
[ogpsd]
device = GTA02Device
@@ -45,4 +44,3 @@
[opimd]
disable = 1
-
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
--- gta01_fso-image-om_etc_frameworkd.conf 2009-06-02 20:38:14.000000000 +0200
+++ gta02_fso-image-om_etc_frameworkd.conf 2009-02-23 21:41:39.000000000 +0100
@@ -9,25 +9,40 @@
# 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]
-# Keys
+# 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]
-# GTA01 has TI Calypso
+# GTA02 has TI Calypso
modemtype = ti_calypso
ti_calypso_deep_sleep = never
[ogpsd]
-device = NMEADevice
-channel = GllinChannel
-path = /etc/init.d/gllin
+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
+
--8<---------------cut here---------------end--------------->8---
While we should try to follow upstream, I would prefer to keep as many
options as possible common to the two packages, e.g. the logging ones.
Thus, since WRT frameworkd the only differences should be about the
GPS chipset and the accelerometers.
I will work to implement/test all of the aboves in the next days, again
if no one complains before.
Thx, bye,
Gismo / Luca
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 314 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20090603/8068f48c/attachment.pgp>
More information about the pkg-fso-maint
mailing list