summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2008-06-26 14:28:18 +0000
committerPhilip Balister <philip@balister.org>2008-06-26 14:28:18 +0000
commit1ed0deaac092272dfa5206a227e30adc8efd4f88 (patch)
tree7bdb9066a41c27b2f9d3a52871b7379d1cdacb41 /packages
parentd032555264023e95a5e9847be6133dd1d8c974c8 (diff)
parent591be26f58217b3e726f58c2648a42b5e02e7b5c (diff)
merge of 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
and 'fb432a3c848fb8f9a30c288a565d9490a1d9b318'
Diffstat (limited to 'packages')
-rw-r--r--packages/freesmartphone/frameworkd/frameworkd.conf1
-rw-r--r--packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf11
-rw-r--r--packages/freesmartphone/frameworkd_git.bb2
-rw-r--r--packages/linux/linux-omap2_git.bb4
4 files changed, 13 insertions, 5 deletions
diff --git a/packages/freesmartphone/frameworkd/frameworkd.conf b/packages/freesmartphone/frameworkd/frameworkd.conf
index e69de29bb2..8b13789179 100644
--- a/packages/freesmartphone/frameworkd/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/frameworkd.conf
@@ -0,0 +1 @@
+
diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
index 0076639f98..b38425129f 100644
--- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
@@ -1,8 +1,15 @@
[idlenotifier]
-# don't read from accellerometers for now
+# don't read from accellerometers for GTA02
ignoreinput=2,3
[input]
-# don't read from accellerometers for now
+# don't read from accellerometers for GTA02
ignoreinput=2,3
+[ophoned]
+# GTA02 has TI Calypso
+modemtype = ti_calypso
+
+[opreferencesd]
+rootdir =
+../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 53ea10f0fb..4d3e498f9e 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
PV = "0.8.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit distutils update-rc.d
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 29cfb35bdb..3147ef46a7 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,9 +2,9 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "6604ac6c8a14d583a463159f3a1601427dab7e05"
+SRCREV = "af933cd32a5e14f119a4acb4fe20055f6f8ab1aa"
-PV = "2.6.25+2.6.26-rc7+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
PR = "r30"